From nobody Fri Apr 29 02:16:03 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E8F361992479; Fri, 29 Apr 2022 02:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KqGLW6GL7z3F5c; Fri, 29 Apr 2022 02:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651198563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vyKa4Ngj73ZocNLFTDZZGjZZuD2PFuVX1BTTfuRmff8=; b=iQd26wBljdBbJn07sNMhsAjTHqaN8pUafJWDGKAyTMZfftrVUr2jTiQms4Gb0RM0W1ubSw 6BkDMLQVyilp46kKf51H30auq92QCUa9mtOUseT2+bA1khFlJR81+NilubJP++7bzYDEm6 1JFu2OR3jMERdyNsjpCPAmG2+Pa0rPi/6GtMgOqverIa4X0MbtQ+clzalpMKWR9La/4P2f vj4wxk/8xxHslkF6pXJswqtSNl48pZeY8HO/WT/+upyfNWmVjoPsz6tNkDlbViMrxeTaAN AV/2MgawKp3ynM2dIhIq0uJyeC/3xHmjabjq22d/tv4vCAbZuc+vjktYWJJJPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8E2F24149; Fri, 29 Apr 2022 02:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23T2G3FY045834; Fri, 29 Apr 2022 02:16:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23T2G3E8045833; Fri, 29 Apr 2022 02:16:03 GMT (envelope-from git) Date: Fri, 29 Apr 2022 02:16:03 GMT Message-Id: <202204290216.23T2G3E8045833@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: cc3322db8bfb - main - net/gitup: fix SIGBUS List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc3322db8bfb8393736ec23624a36ccacb7e22b7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651198563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vyKa4Ngj73ZocNLFTDZZGjZZuD2PFuVX1BTTfuRmff8=; b=FpPkH+xdrZXABHmuk+rUKAxMqzIe25LtN31buX4XNnKXavODhMWkILmf/+ujoK30BnafZm FKrUD2oW1M9qTAkMLBTo2NAAFn2YPZHBALQepXyo/pPg2IlhaEgc2g5RfKfjosXYBr/4zq Zcv4yeYkgdchJ4l5K5c7huWaHUyMMFVRgg4G+RZobOqEgR2ltNY0I6rk1mt/fzMp/I9f/t gEZD/PFiqi23RkFecvUvFcc4pG1LyCxKAwphzTHG8b4mAcC5SiFaQwunLFUv6XQlBdZqcq IjWa3/Rehi3eJ89USGUPAgzsffsYIbsLvgwe0HHQ8ifJs/YOnqC/THK4NOvhtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651198563; a=rsa-sha256; cv=none; b=h6YfbJq3ewv//wWdgF4YvU4eck97rJd//BKSmlO3OfVfBbJMGzrJsUhtxuCQMCHGYho1qW 2ccIeP5AvqRKXYlBAHMwiTcfnoVNCGmiPyZo0T/TMVxgCwsDcw9YlCo2SlBruTU7upGRxl BZbNR1DWpSGKuzG1hMi80j1frHTxZHKOSItn1kw4A6CeIVwN6yBcrAxjHaqYva6DBZkqLa D8cHiEbrq4KUDx/1mMjJeL2VfGsNMnsUuq+GqX3ryOQCo2THdyRJGuA0oOZvgboRjTkWkh nemf+ERuCh6cp3kwhEvP4XKKKZqjMKp6uUGRmiqGSZHGbKz5tNm8T6TSs5W2FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc3322db8bfb8393736ec23624a36ccacb7e22b7 commit cc3322db8bfb8393736ec23624a36ccacb7e22b7 Author: Eugene Grosbein AuthorDate: 2022-04-29 02:12:22 +0000 Commit: Eugene Grosbein CommitDate: 2022-04-29 02:12:22 +0000 net/gitup: fix SIGBUS Temporary add the patch fixing SIGBUS. The patch already accepted to upstream repo but next release delayed for long time. Many thanks to eduardo@ for submitting the patch upstream. PR: 261307 Approved by: eduardo (maintainer timeout, 1 month) --- net/gitup/Makefile | 1 + net/gitup/files/patch-gitup.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/net/gitup/Makefile b/net/gitup/Makefile index 8b1fe7efa168..38480a43ecc5 100644 --- a/net/gitup/Makefile +++ b/net/gitup/Makefile @@ -1,5 +1,6 @@ PORTNAME= gitup DISTVERSION= 0.96 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= eduardo@FreeBSD.org diff --git a/net/gitup/files/patch-gitup.c b/net/gitup/files/patch-gitup.c new file mode 100644 index 000000000000..06765095ef7d --- /dev/null +++ b/net/gitup/files/patch-gitup.c @@ -0,0 +1,32 @@ +--- gitup.c.orig 2021-09-05 19:58:01.000000000 +0300 ++++ gitup.c 2022-01-18 16:53:41.999972000 +0300 +@@ -676,7 +676,8 @@ save_file(char *path, int mode, char *buffer, int buff + memcpy(temp_buffer, buffer, buffer_size); + temp_buffer[buffer_size] = '\0'; + +- if (symlink(temp_buffer, path) == -1) ++ if (symlink(temp_buffer, path) == -1 && ++ (unlink(path), symlink(temp_buffer, path)) == -1) + err(EXIT_FAILURE, + "save_file: symlink failure %s -> %s", + path, +@@ -2800,7 +2801,9 @@ save_repairs(connector *session) + "save_repairs: cannot create %s", + found_file->path); + } else { +- missing = !path_exists(found_file->path); ++ struct stat st; ++ ++ missing = stat(found_file->path, &st) != 0; + update = true; + + /* +@@ -2813,7 +2816,7 @@ save_repairs(connector *session) + + check_hash = calculate_file_hash( + found_file->path, +- found_file->mode); ++ st.st_mode); + + buffer_hash = calculate_object_hash( + found_object->buffer,