pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg: import version 2.0.6



Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Mon Feb 17 18:16:31 2025 +0100
Changeset:	fafa0d31087bc363c8d021fcec2e8743b8b844aa

Modified Files:
	Makefile
Added Files:
	pkg/DESCR
	pkg/Makefile
	pkg/PLIST
	pkg/distinfo
	pkg/patches/patch-external_libder_libder_libder__private.h
	pkg/patches/patch-libpkg_fetch__ssh.c
	pkg/patches/patch-libpkg_pkg__abi.c
	pkg/patches/patch-libpkg_pkg__config.c
	pkg/patches/patch-libpkg_pkg__elf.c
	pkg/patches/patch-libpkg_pkg__jobs.c
	pkg/patches/patch-libpkg_pkgsign__ecc.c
	pkg/patches/patch-libpkg_ssh.c
	pkg/patches/patch-libpkg_utils.c
	pkg/patches/patch-scripts_periodic_411.pkg-backup.in

Log Message:
pkg: import version 2.0.6

This does not build on NetBSD yet.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fafa0d31087bc363c8d021fcec2e8743b8b844aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |   1 +
 pkg/DESCR                                          |   3 +
 pkg/Makefile                                       | 155 +++++++++++++++++++++
 pkg/PLIST                                          |  53 +++++++
 pkg/distinfo                                       |  15 ++
 .../patch-external_libder_libder_libder__private.h |  13 ++
 pkg/patches/patch-libpkg_fetch__ssh.c              |  15 ++
 pkg/patches/patch-libpkg_pkg__abi.c                |  15 ++
 pkg/patches/patch-libpkg_pkg__config.c             |  15 ++
 pkg/patches/patch-libpkg_pkg__elf.c                |  17 +++
 pkg/patches/patch-libpkg_pkg__jobs.c               |  13 ++
 pkg/patches/patch-libpkg_pkgsign__ecc.c            |  13 ++
 pkg/patches/patch-libpkg_ssh.c                     |  14 ++
 pkg/patches/patch-libpkg_utils.c                   |  14 ++
 .../patch-scripts_periodic_411.pkg-backup.in       |  15 ++
 15 files changed, 371 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 814adb27cd..6b7089a289 100644
--- a/Makefile
+++ b/Makefile
@@ -3196,6 +3196,7 @@ SUBDIR+=	piranha
 SUBDIR+=	piwik
 SUBDIR+=	pizza
 SUBDIR+=	pjproject
+SUBDIR+=	pkg
 SUBDIR+=	pkg-dev
 SUBDIR+=	pkg_conflicts
 SUBDIR+=	pkg_fake
diff --git a/pkg/DESCR b/pkg/DESCR
new file mode 100644
index 0000000000..442989aa43
--- /dev/null
+++ b/pkg/DESCR
@@ -0,0 +1,3 @@
+pkg is built on top of libpkg, a new library to interface with package
+registration backends. It abstracts package management details such as
+registration, remote repositories, package creation, updating, etc.
diff --git a/pkg/Makefile b/pkg/Makefile
new file mode 100644
index 0000000000..1335607e0e
--- /dev/null
+++ b/pkg/Makefile
@@ -0,0 +1,155 @@
+# $NetBSD: Makefile,v 1.31 2023/07/03 11:29:04 vins Exp $
+
+DISTNAME=	pkg-2.0.6
+CATEGORIES=	pkgtools
+MASTER_SITES=	${MASTER_SITE_GITHUB:=freebsd/}
+GITHUB_TAG=	${PKGVERSION_NOREV}
+
+MAINTAINER=	khorben%defora.org@localhost
+HOMEPAGE=	https://wiki.freebsd.org/pkg
+COMMENT=	Package management tool for FreeBSD
+LICENSE=	2-clause-bsd
+
+BOOTSTRAP_PKG=	yes
+HAS_CONFIGURE=	yes
+USE_CWRAPPERS=	no
+USE_LANGUAGES=	c
+
+LDFLAGS+=	-pthread
+CPPFLAGS+=	-D_LOCALBASE="\"${PREFIX}\""
+CPPFLAGS+=	-DPORTSDIR="\"${PKG.portsdir}\""
+CPPFLAGS+=	-DDEFAULT_VULNXML_URL="\"http://muscles.dragonflybsd.org/pkgsrc-vuxml/vuln.xml.bz2\"";
+CFLAGS+=	-DSYSCONFDIR=\"${PKG_SYSCONFDIR}\"
+
+.if defined(DEBUG_PKGNG)
+CFLAGS:=		${CFLAGS:N-O2} -ggdb -O0
+_STRIPFLAG_INSTALL=	# don't strip
+.endif
+
+AUTO_MKDIRS=	yes
+
+EGDIR=		${PREFIX}/share/examples/pkg
+
+CONF_FILES+=	${EGDIR}/bash_completion.d/_pkg.bash \
+		${PKG_SYSCONFDIR}/bash_completion.d/_pkg.bash
+CONF_FILES+=	${EGDIR}/periodic/daily/411.pkg-backup \
+		${PKG_SYSCONFDIR}/periodic/daily/411.pkg-backup
+CONF_FILES+=	${EGDIR}/periodic/daily/490.status-pkg-changes \
+		${PKG_SYSCONFDIR}/periodic/daily/490.status-pkg-changes
+CONF_FILES+=	${EGDIR}/periodic/security/410.pkg-audit \
+		${PKG_SYSCONFDIR}/periodic/security/410.pkg-audit
+CONF_FILES+=	${EGDIR}/periodic/security/460.pkg-checksum \
+		${PKG_SYSCONFDIR}/periodic/security/460.pkg-checksum
+CONF_FILES+=	${EGDIR}/periodic/weekly/400.status-pkg \
+		${PKG_SYSCONFDIR}/periodic/weekly/400.status-pkg
+CONF_FILES+=	${EGDIR}/pkg.conf.sample \
+		${PKG_SYSCONFDIR}/pkg.conf
+
+OWN_DIRS=	${PKG_SYSCONFDIR}/bash_completion.d \
+		${PKG_SYSCONFDIR}/periodic/daily \
+		${PKG_SYSCONFDIR}/periodic/security \
+		${PKG_SYSCONFDIR}/periodic/weekly
+
+SUBST_CLASSES+=			manpages-prefix
+SUBST_STAGE.manpages-prefix=	pre-install
+SUBST_FILES.manpages-prefix=	docs/pkg-install.8 docs/pkg-repo.8
+SUBST_FILES.manpages-prefix+=	docs/pkg-search.8 docs/pkg-update.8
+SUBST_FILES.manpages-prefix+=	docs/pkg-upgrade.8 docs/pkg.8
+SUBST_FILES.manpages-prefix+=	docs/pkg.conf.5
+SUBST_SED.manpages-prefix+=	-e "s|/usr/local|${PREFIX}|g"
+SUBST_MESSAGE.manpages-prefix=	Correct the installation prefix in manual pages.
+
+SUBST_CLASSES+=			pkgconf-prefix
+SUBST_STAGE.pkgconf-prefix=	pre-install
+SUBST_FILES.pkgconf-prefix=	src/pkg.conf.sample
+SUBST_SED.pkgconf-prefix+=	-e "s|/usr/local|${PREFIX}|g"
+SUBST_MESSAGE.pkgconf-prefix=	Correct the installation prefix in pkg.conf(5).
+
+SUBST_CLASSES+=		portsdir
+SUBST_STAGE.portsdir=	pre-install
+SUBST_FILES.portsdir=	src/pkg.conf.sample \
+			docs/pkg-create.8 \
+			docs/pkg-set.8 \
+			docs/pkg-repo.8 \
+			docs/pkg.conf.5 \
+			docs/pkg-version.8 \
+			docs/pkg.8
+SUBST_SED.portsdir=	-e "s|/usr/ports|${PKG.portsdir}|g" \
+			-e "s|/var/db/pkg|${PKGNG_DBDIR}|g" \
+			-e "s|/var/cache/pkg|${VARBASE}/cache/pkgng|g"
+SUBST_MESSAGE.portsdir=	Correct reference to FreeBSD portsdir.
+
+SUBST_CLASSES+=		config
+SUBST_STAGE.config=	pre-configure
+SUBST_FILES.config=	libpkg/pkg_config.c
+SUBST_SED.config=	-e "s|/usr/ports|${PKG.portsdir}|g" \
+			-e "s|/var/db/pkg|${PKGNG_DBDIR}|g" \
+			-e "s|/var/cache/pkg|${VARBASE}/cache/pkgng|g"
+SUBST_MESSAGE.config=	Update pkg(8) defaults.
+
+#SUBST_CLASSES+=		vuxml
+#SUBST_STAGE.vuxml=	pre-configure
+#SUBST_FILES.vuxml=	libpkg/pkg_audit.c
+#SUBST_SED.vuxml=	-e "s|https://vuxml.FreeBSD.org/freebsd|http://muscles.dragonflybsd.org/pkgsrc-vuxml/reports|"
+#SUBST_MESSAGE.vuxml=	Direct audit reports to Pkgsrc vuxml
+
+# Install manpages under ${PKGMANDIR}.
+INSTALL_MAKE_FLAGS+=	mandir=${PREFIX:Q}/${PKGMANDIR:Q}
+
+.if defined(PACKAGE_BUILDING) # set by Synth which has custom location, so use default path
+PKG.portsdir?=	/usr/pkgsrc
+.else
+PKG.portsdir?=	${PKGSRCDIR}
+.endif
+
+# DragonFly SSL libraries are private.  pkg(8) is the one exception of a userland
+# program that is allowed to link to them due to bootstrap reasons
+.if exists(/usr/lib/priv/libprivate_ssl.so)
+BUILDLINK_PASSTHRU_RPATHDIRS=	/lib/priv
+.endif
+
+post-patch:
+# DragonFly SSL libraries are private.
+.if exists(/usr/lib/priv/libprivate_ssl.so)
+	${SED} -i.bak \
+		-e 's|lssl|lprivate_ssl|' \
+		-e 's|lcrypto|lprivate_crypto|' \
+		-e 's|la_rpath = |la_rpath = -R/lib/priv |' \
+		${WRKSRC}/libpkg/Makefile.in \
+		${WRKSRC}/src/Makefile.in \
+		${WRKSRC}/tests/Makefile.in
+	${SED} -i.bak \
+		-e '/OS_CFLAGS=/ s|SOURCE|SOURCE -I/usr/include/priv|' \
+		-e '/OS_LDFLAGS=/ s|=|="-L/usr/lib/priv -R/lib/priv"|' \
+		${WRKSRC}/configure
+.endif
+
+post-install:
+	${RM} -rf ${DESTDIR}${EGDIR}/periodic
+	${MV} ${DESTDIR}${PREFIX}/etc/bash_completion.d \
+		${DESTDIR}${EGDIR}/
+	${MV} ${DESTDIR}${PREFIX}/etc/periodic \
+		${DESTDIR}${EGDIR}/
+	${MV} ${DESTDIR}${PREFIX}/etc/pkg.conf.sample \
+		${DESTDIR}${EGDIR}/
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined (PKG_DBDIR)
+PKGNG_DBDIR?=	${PKG_DBDIR}
+.else
+PKGNG_DBDIR?=	${PREFIX}/pkgng-db
+.endif
+
+.if ${OPSYS} == "NetBSD"
+BUILDLINK_TRANSFORM+=	rm:-Wl,--enable-new-dtags
+.endif
+
+.if ${OPSYS} != "FreeBSD" && ${OPSYS} != "DragonFly" && ${OPSYS} != "NetBSD"
+.include "../../archivers/libarchive/buildlink3.mk"
+.  if ${OPSYS} == "Linux"
+.    include "../../devel/libbsd/buildlink3.mk"
+.  endif
+.endif
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/pkg/PLIST b/pkg/PLIST
new file mode 100644
index 0000000000..83ef2e59eb
--- /dev/null
+++ b/pkg/PLIST
@@ -0,0 +1,53 @@
+@comment $NetBSD: PLIST,v 1.8 2020/09/21 03:03:55 khorben Exp $
+include/pkg.h
+lib/libpkg.la
+lib/libpkg_static.la
+libdata/pkgconfig/pkg.pc
+man/man3/pkg_printf.3
+man/man3/pkg_repos.3
+man/man5/pkg-repository.5
+man/man5/pkg.conf.5
+man/man8/pkg-add.8
+man/man8/pkg-alias.8
+man/man8/pkg-annotate.8
+man/man8/pkg-audit.8
+man/man8/pkg-autoremove.8
+man/man8/pkg-backup.8
+man/man8/pkg-check.8
+man/man8/pkg-clean.8
+man/man8/pkg-config.8
+man/man8/pkg-create.8
+man/man8/pkg-delete.8
+man/man8/pkg-fetch.8
+man/man8/pkg-info.8
+man/man8/pkg-install.8
+man/man8/pkg-lock.8
+man/man8/pkg-query.8
+man/man8/pkg-register.8
+man/man8/pkg-remove.8
+man/man8/pkg-repo.8
+man/man8/pkg-rquery.8
+man/man8/pkg-search.8
+man/man8/pkg-set.8
+man/man8/pkg-shell.8
+man/man8/pkg-shlib.8
+man/man8/pkg-ssh.8
+man/man8/pkg-static.8
+man/man8/pkg-stats.8
+man/man8/pkg-unlock.8
+man/man8/pkg-update.8
+man/man8/pkg-updating.8
+man/man8/pkg-upgrade.8
+man/man8/pkg-version.8
+man/man8/pkg-which.8
+man/man8/pkg.8
+sbin/pkg
+sbin/pkg-static
+share/examples/pkg/bash_completion.d/_pkg.bash
+share/examples/pkg/periodic/daily/411.pkg-backup
+share/examples/pkg/periodic/daily/490.status-pkg-changes
+share/examples/pkg/periodic/security/410.pkg-audit
+share/examples/pkg/periodic/security/460.pkg-checksum
+share/examples/pkg/periodic/weekly/400.status-pkg
+share/examples/pkg/pkg.conf.sample
+share/zsh/site-functions/_pkg
diff --git a/pkg/distinfo b/pkg/distinfo
new file mode 100644
index 0000000000..d0faf2056f
--- /dev/null
+++ b/pkg/distinfo
@@ -0,0 +1,15 @@
+$NetBSD: distinfo,v 1.17 2021/10/26 11:11:07 nia Exp $
+
+BLAKE2s (pkg-2.0.6.tar.gz) = bb247357520170299ebbbca37c77279d63514ea644c1148fc7b3077f43108e0a
+SHA512 (pkg-2.0.6.tar.gz) = 9f8edd5b3f18eaf0e4602e062c156cb3fc8d544e5a6ec6501201fd4f9b22976acbfd4dbeed80b1c77b4fdd2c5f0f4499bd51cf28a29656679c3a2c25565d24c9
+Size (pkg-2.0.6.tar.gz) = 16399889 bytes
+SHA1 (patch-external_libder_libder_libder__private.h) = 6cb11bcea09b45a41a25b9e45500bb156c5fca5a
+SHA1 (patch-libpkg_fetch__ssh.c) = 2b3e26dfe43b5d585dffae065d9a1e5ed137bc47
+SHA1 (patch-libpkg_pkg__abi.c) = 7803f49bf32f0018545d5ac02195e6dd844bea35
+SHA1 (patch-libpkg_pkg__config.c) = d2998971010c9196400f1fba5174acc03386f012
+SHA1 (patch-libpkg_pkg__elf.c) = f65eadb3c6b85933c4f6b9ab5a1064707ace0cb3
+SHA1 (patch-libpkg_pkg__jobs.c) = 75dadbaebd9963f583ee06c7dd30c4bb27749645
+SHA1 (patch-libpkg_pkgsign__ecc.c) = 7397f39dfb830bf914dbac57a876586ea69ad980
+SHA1 (patch-libpkg_ssh.c) = 533f4b06c270a68318ae44cd1de17fa27c95d347
+SHA1 (patch-libpkg_utils.c) = 75ba395d5ca08546428d088b80c62add553dfd16
+SHA1 (patch-scripts_periodic_411.pkg-backup.in) = ec4ff8991b79608c448739b693b2eb527b646c63
diff --git a/pkg/patches/patch-external_libder_libder_libder__private.h b/pkg/patches/patch-external_libder_libder_libder__private.h
new file mode 100644
index 0000000000..38cfbbb8d9
--- /dev/null
+++ b/pkg/patches/patch-external_libder_libder_libder__private.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- external/libder/libder/libder_private.h.orig	2025-02-17 16:29:09.698886269 +0000
++++ external/libder/libder/libder_private.h
+@@ -150,6 +150,8 @@ libder_bzero(uint8_t *buf, size_t bufsz)
+ 
+ #ifdef __APPLE__
+ 	memset_s(buf, bufsz, 0, bufsz);
++#elif defined(__NetBSD__)
++	explicit_memset(buf, 0, bufsz);
+ #else
+ 	explicit_bzero(buf, bufsz);
+ #endif
diff --git a/pkg/patches/patch-libpkg_fetch__ssh.c b/pkg/patches/patch-libpkg_fetch__ssh.c
new file mode 100644
index 0000000000..ed37484dce
--- /dev/null
+++ b/pkg/patches/patch-libpkg_fetch__ssh.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- libpkg/fetch_ssh.c.orig	2025-02-17 16:42:03.451233170 +0000
++++ libpkg/fetch_ssh.c
+@@ -34,6 +34,10 @@
+ #include <ctype.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#ifdef __NetBSD__
++# define _OPENBSD_SOURCE
++# include <stdlib.h>
++#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <paths.h>
diff --git a/pkg/patches/patch-libpkg_pkg__abi.c b/pkg/patches/patch-libpkg_pkg__abi.c
new file mode 100644
index 0000000000..7da92ee605
--- /dev/null
+++ b/pkg/patches/patch-libpkg_pkg__abi.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- libpkg/pkg_abi.c.orig	2025-02-17 16:43:06.627503382 +0000
++++ libpkg/pkg_abi.c
+@@ -16,6 +16,10 @@
+ #include <paths.h>
+ #include <string.h>
+ #include <unistd.h>
++#ifdef __NetBSD__
++# define _OPENBSD_SOURCE
++# include <stdlib.h>
++#endif
+ 
+ #include "pkg.h"
+ #include "private/pkg_abi.h"
diff --git a/pkg/patches/patch-libpkg_pkg__config.c b/pkg/patches/patch-libpkg_pkg__config.c
new file mode 100644
index 0000000000..50b0c04dea
--- /dev/null
+++ b/pkg/patches/patch-libpkg_pkg__config.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- libpkg/pkg_config.c.orig	2025-02-17 16:34:16.769671839 +0000
++++ libpkg/pkg_config.c
+@@ -35,6 +35,10 @@
+ #include <ctype.h>
+ #include <dirent.h>
+ #include <dlfcn.h>
++#ifdef __NetBSD__
++# define _OPENBSD_SOURCE
++#include <stdlib.h>
++#endif
+ #include <errno.h>
+ #include <fcntl.h>
+ #ifdef HAVE_OSRELDATE_H
diff --git a/pkg/patches/patch-libpkg_pkg__elf.c b/pkg/patches/patch-libpkg_pkg__elf.c
new file mode 100644
index 0000000000..b1f095698c
--- /dev/null
+++ b/pkg/patches/patch-libpkg_pkg__elf.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- libpkg/pkg_elf.c.orig	2025-02-17 17:11:30.242681773 +0000
++++ libpkg/pkg_elf.c
+@@ -414,10 +414,12 @@ elf_parse_arch(Elf *elf, GElf_Ehdr *ehdr
+ 	case EM_AARCH64:
+ 		return (PKG_ARCH_AARCH64);
+ 	case EM_ARM:
++#ifdef EF_ARM_EABIMASK
+ 		/* Only support EABI */
+ 		if ((ehdr->e_flags & EF_ARM_EABIMASK) == 0) {
+ 			return (PKG_ARCH_UNKNOWN);
+ 		}
++#endif
+ 
+ 		size_t shstrndx;
+ 		elf_getshdrstrndx(elf, &shstrndx);
diff --git a/pkg/patches/patch-libpkg_pkg__jobs.c b/pkg/patches/patch-libpkg_pkg__jobs.c
new file mode 100644
index 0000000000..4b24119da6
--- /dev/null
+++ b/pkg/patches/patch-libpkg_pkg__jobs.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- libpkg/pkg_jobs.c.orig	2025-02-17 16:47:31.543147819 +0000
++++ libpkg/pkg_jobs.c
+@@ -2300,7 +2300,7 @@ pkg_jobs_fetch(struct pkg_jobs *j)
+ 	if (dlsize == 0)
+ 		return (EPKG_OK);
+ 
+-#ifdef HAVE_FSTATFS
++#if defined(HAVE_FSTATFS) && !defined(__NetBSD__)
+ 	struct statfs fs;
+ 	while (statfs(cachedir, &fs) == -1) {
+ 		if (errno == ENOENT) {
diff --git a/pkg/patches/patch-libpkg_pkgsign__ecc.c b/pkg/patches/patch-libpkg_pkgsign__ecc.c
new file mode 100644
index 0000000000..9653450453
--- /dev/null
+++ b/pkg/patches/patch-libpkg_pkgsign__ecc.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- libpkg/pkgsign_ecc.c.orig	2025-02-17 16:32:34.691110431 +0000
++++ libpkg/pkgsign_ecc.c
+@@ -819,6 +819,8 @@ _specific_explicit_bzero(void *buf, size
+ 
+ #ifdef __APPLE__
+ 	memset_s(buf, bufsz, 0, bufsz);
++#elif defined(__NetBSD__)
++	explicit_memset(buf, 0, bufsz);
+ #else
+ 	explicit_bzero(buf, bufsz);
+ #endif
diff --git a/pkg/patches/patch-libpkg_ssh.c b/pkg/patches/patch-libpkg_ssh.c
new file mode 100644
index 0000000000..c0e9cc9bb4
--- /dev/null
+++ b/pkg/patches/patch-libpkg_ssh.c
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- libpkg/ssh.c.orig	2025-02-17 16:40:08.471070566 +0000
++++ libpkg/ssh.c
+@@ -36,6 +36,9 @@
+ #include <sys/stat.h>
+ 
+ #include <ctype.h>
++#ifdef __NetBSD__
++# define _OPENBSD_SOURCE
++#endif
+ #include <stdlib.h>
+ #include <inttypes.h>
+ #include <stdio.h>
diff --git a/pkg/patches/patch-libpkg_utils.c b/pkg/patches/patch-libpkg_utils.c
new file mode 100644
index 0000000000..40b154e962
--- /dev/null
+++ b/pkg/patches/patch-libpkg_utils.c
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- libpkg/utils.c.orig	2025-02-17 16:41:03.857250598 +0000
++++ libpkg/utils.c
+@@ -38,6 +38,9 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#ifdef __NetBSD__
++# define _OPENBSD_SOURCE
++#endif
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
diff --git a/pkg/patches/patch-scripts_periodic_411.pkg-backup.in b/pkg/patches/patch-scripts_periodic_411.pkg-backup.in
new file mode 100644
index 0000000000..b65bf2375f
--- /dev/null
+++ b/pkg/patches/patch-scripts_periodic_411.pkg-backup.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-scripts_periodic_411.pkg-backup.in,v 1.1 2020/04/10 23:28:32 khorben Exp $
+
+Pass the portability test
+
+--- scripts/periodic/411.pkg-backup.in.orig	2020-04-10 23:10:58.674050832 +0000
++++ scripts/periodic/411.pkg-backup.in
+@@ -25,7 +25,7 @@ backup_pkg() {
+ 	for i in $(jot ${count} ${lower} 0); do
+ 		local higher=$(( ${i} + 1 ))
+ 		local file
+-		if [ ${i} == 0 ]; then
++		if [ ${i} = 0 ]; then
+ 			file=${bak_file}
+ 		else
+ 			file=${bak_file}.${i}


Home | Main Index | Thread Index | Old Index