pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/60854: www/cgit: Inconsistent cgitrc location in the built cgit-cgi binary
>Number: 60854
>Category: pkg
>Synopsis: www/cgit: Inconsistent cgitrc location in the built cgit-cgi binary
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Tue Oct 06 07:30:00 +0000 2026
>Originator: Sunil Nimmagadda
>Release: pkgsrc -current
>Organization:
>Environment:
NetBSD beasty 11.99.6 NetBSD 11.99.6 (GENERIC64) #1: Fri May 22 08:49:00 IST 2026 skn@beasty:/home/skn/obj/sys/arch/evbarm/compile/GENERIC64 evbarm
>Description:
The package Makefile defines CGIT_CONFIG as...
BUILD_MAKE_FLAGS+= CGIT_CONFIG=${PKG_SYSCONFDIR}/cgitrc
which translates to '/usr/pkg/etc/cgitrc' on a default pkgsrc install,
however, the built cgit-cgi binary records 'etc/cgitrc'...
/tmp$ tar -zxvf ~/pkgsrc/packages/All/cgit-1.3nb1.tgz
/tmp/libexec/cgi-bin$ strings ./cgit.cgi | grep cgitrc
/etc/cgitrc
cgitrc
cgit-cgi now fails to find the configured repositories in
/usr/pkg/etc/cgitrc erroneously returning 'no repositories found' on
the webpage.
Grepping .work.log shows CGIT_CONFIG=/usr/pkg/etc/cgitrc for some
compilations and subsequently it _fallsback?_ to CGIT_CONFIG=/etc/cgitrc...
<.> ~/pkgsrc/www/cgit/work/.gcc/bin/gcc -fcommon -fstack-protector-strong -D_FORTIFY_SOURCE=2 -fPIC -o ../ui-tree.o -c -MF ../.depend/ui-tree.o.d -MQ ../ui-tree.o -MMD -MP -O2 -I. -I~/pkgsrc/www/cgit/work/.buildlink/include '-DGIT_HOST_CPU="evbarm"' -DN
O_CURL -DUSE_ST_TIMESPEC -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 '-DSHA1DC_CUSTOM_INCLUDE_SHA1_C="git-compat-util.h"' '-DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h"' -DSHA256_BLK -DHAVE_PATHS_H -DHAVE_BS
D_SYSCTL -DHAVE_ARC4RANDOM '-DSHELL_PATH="/bin/sh"' '-DCGIT_CONFIG="/usr/pkg/etc/cgitrc"' '-DCGIT_SCRIPT_NAME="cgit.cgi"' '-DCGIT_CACHE_ROOT="/var/cache/cgit"' -DNO_LUA ../ui-tree.c
[*] cc -o ../cgit.o -c -MF ../.depend/cgit.o.d -MQ ../cgit.o -MMD -MP -I/usr/include -O2 -I/usr/include -I. -I/usr/pkg/include '-DGIT_HOST_CPU="evbarm"' -DNO_CURL -DUSE_ST_TIMESPEC -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DE
FAULT=0 '-DSHA1DC_CUSTOM_INCLUDE_SHA1_C="git-compat-util.h"' '-DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h"' -DSHA256_BLK -DHAVE_PATHS_H -DHAVE_BSD_SYSCTL -DHAVE_ARC4RANDOM '-DSHELL_PATH="/bin/sh"' '-DCGIT_VERSION="v1.3"' '-DCGIT_CONFIG="/etc/cgitrc"' '-DCGIT
_SCRIPT_NAME="cgit.cgi"' '-DCGIT_CACHE_ROOT="/var/cache/cgit"' -DNO_LUA ../cgit.c
<.> ~/pkgsrc/www/cgit/work/.gcc/bin/gcc -fcommon -fstack-protector-strong -D_FORTIFY_SOURCE=2 -fPIC -o ../cgit.o -c -MF ../.depend/cgit.o.d -MQ ../cgit.o -MMD -MP -O2 -I. -I~/pkgsrc/www/cgit/work/.buildlink/include '-DGIT_HOST_CPU="evbarm"' -DNO_CURL -D
USE_ST_TIMESPEC -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 '-DSHA1DC_CUSTOM_INCLUDE_SHA1_C="git-compat-util.h"' '-DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h"' -DSHA256_BLK -DHAVE_PATHS_H -DHAVE_BSD_SYSCTL
-DHAVE_ARC4RANDOM '-DSHELL_PATH="/bin/sh"' '-DCGIT_VERSION="v1.3"' '-DCGIT_CONFIG="/etc/cgitrc"' '-DCGIT_SCRIPT_NAME="cgit.cgi"' '-DCGIT_CACHE_ROOT="/var/cache/cgit"' -DNO_LUA ../cgit.c
[*] cc -o ../cache.o -c -MF ../.depend/cache.o.d -MQ ../cache.o -MMD -MP -I/usr/include -O2 -I/usr/include -I. -I/usr/pkg/include '-DGIT_HOST_CPU="evbarm"' -DNO_CURL -DUSE_ST_TIMESPEC -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH
_DEFAULT=0 '-DSHA1DC_CUSTOM_INCLUDE_SHA1_C="git-compat-util.h"' '-DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h"' -DSHA256_BLK -DHAVE_PATHS_H -DHAVE_BSD_SYSCTL -DHAVE_ARC4RANDOM '-DSHELL_PATH="/bin/sh"' '-DCGIT_CONFIG="/etc/cgitrc"' '-DCGIT_SCRIPT_NAME="cgit.cg
i"' '-DCGIT_CACHE_ROOT="/var/cache/cgit"' -DNO_LUA ../cache.c
>How-To-Repeat:
cd pkgsrc/www/cgit && make package
Extract the package someplace and inspect the cgit-cgi binary.
>Fix:
MAKE_FLAGS propagates it fine with this diff...
diff --git a/www/cgit/Makefile b/www/cgit/Makefile
index dde8abecbfa0..f6983a55941b 100644
--- a/www/cgit/Makefile
+++ b/www/cgit/Makefile
@@ -28,7 +28,7 @@ MAKE_FLAGS+= filterdir=${CGIT_FILTERS}
MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}
MAKE_FLAGS+= PYTHON_PATH=${PYTHONBIN}
MAKE_FLAGS+= INSTALL=${INSTALL}
-BUILD_MAKE_FLAGS+= CGIT_CONFIG=${PKG_SYSCONFDIR}/cgitrc
+MAKE_FLAGS+= CGIT_CONFIG=${PKG_SYSCONFDIR}/cgitrc
MAKE_ENV+= CGIT_LIBS=${LIBNBCOMPAT_LIBNAME}
MAKE_ENV.SunOS+= NEEDS_LIBICONV=YesPlease
/tmp/cgit$ strings libexec/cgi-bin/cgit.cgi | grep cgitrc
/usr/pkg/etc/cgitrc
cgitrc
Home |
Main Index |
Thread Index |
Old Index