President Gustavo Petro of Colombia and President Trump have had a tense relationship that escalated into threats by Mr. Trump, before easing.

Trump signed the funding package into law this afternoon, ending a brief shutdown that started on Saturday.

“We’re going to be talking about drugs,” he said, “because tremendous amounts of drugs come out of his country.”