diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index d996dd3f8b78..0fc71641375d 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -1,78 +1,78 @@ PORTNAME= pkg -DISTVERSION= 1.20.99.1 +DISTVERSION= 1.20.99.2 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt PKGNAMESUFFIX= -devel MAINTAINER= pkg@FreeBSD.org COMMENT= Package manager WWW= https://github.com/freebsd/pkg LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 7ceb2494 +GH_TAGNAME= 67b61a85 CFLAGS+= -O0 -g -Wno-error USE_LDCONFIG= ${PREFIX}/lib/compat/pkg HAS_CONFIGURE= yes PORTDOCS= NEWS PORTSCOUT= ignore:1 CONFIGURE_ARGS= --mandir=${PREFIX}/man --prefix="${PREFIX}" CONFIGURE_ENV= CC_FOR_BUILD="${CC}" # Use a submake as 'deinstall install' needs to reevaluate PKG_REGISTER # so that pkg-static is used from the wrkdir USE_SUBMAKE= yes OPTIONS_DEFINE= DOCS SAN SAN_DESC= Enable sanitizers (ASAN and UBSAN) .if !exists(/usr/include/jail.h) EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .endif .include .if ${PORT_OPTIONS:MSAN} CONFIGURE_ARGS+= --with-asan --with-ubsan .endif # TODO: activate in april 2021 #.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1400000 #CONFIGURE_ARGS+= --default-format=tzst #.endif .if defined(WITH_PKG) .if ${WITH_PKG} != devel . if !defined(PACKAGE_BUILDING) IGNORE= WITH_PKG is not defined to 'devel', this version is the devel one . endif .else PKGNAMESUFFIX= #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) PKG_DEPENDS= .endif .endif .undef INSTALLS_DEPENDS .if !exists(${LOCALBASE}/sbin/pkg) && !defined(CROSS_TOOLCHAIN) PKG_BIN= ${WRKSRC}/src/pkg-static .endif .if ${PORT_OPTIONS:MSAN} post-build: @(cd ${WRKSRC}/src && \ ${LN} -fs pkg pkg-static) .endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS .if ${PORT_OPTIONS:MSAN} @${CP} ${STAGEDIR}${PREFIX}/sbin/pkg ${STAGEDIR}${PREFIX}/sbin/pkg-static .endif .include diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo index 12eca77fada6..69c701c23fcf 100644 --- a/ports-mgmt/pkg-devel/distinfo +++ b/ports-mgmt/pkg-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688630373 -SHA256 (freebsd-pkg-1.20.99.1-7ceb2494_GH0.tar.gz) = 5017859079cd017ff313f04210d7235e0f3705bd8af2e2f8eace40238f1f8dee -SIZE (freebsd-pkg-1.20.99.1-7ceb2494_GH0.tar.gz) = 8242692 +TIMESTAMP = 1688991180 +SHA256 (freebsd-pkg-1.20.99.2-67b61a85_GH0.tar.gz) = c4d982ad4609210f63882425cea1753bb3c4e3f3bdd5da38aaff3e8f83d851e1 +SIZE (freebsd-pkg-1.20.99.2-67b61a85_GH0.tar.gz) = 8242789 diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index d7e0df3d62a6..0ce6a6b94ac7 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,88 +1,87 @@ PORTNAME= pkg -DISTVERSION= 1.20.1 -PORTREVISION= 1 +DISTVERSION= 1.20.2 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MAINTAINER= pkg@FreeBSD.org COMMENT= Package manager WWW= https://github.com/freebsd/pkg LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= freebsd USE_LDCONFIG= ${PREFIX}/lib/compat/pkg HAS_CONFIGURE= yes PORTDOCS= NEWS PORTSCOUT= ignore:1 CONFIGURE_ARGS= --mandir=${PREFIX}/man --prefix="${PREFIX}" CONFIGURE_ENV= CC_FOR_BUILD="${CC}" # Use a submake as 'deinstall install' needs to reevaluate PKG_REGISTER # so that pkg-static is used from the wrkdir USE_SUBMAKE= yes CFLAGS+= -Wno-error CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 OPTIONS_DEFINE= DOCS .if !exists(/usr/include/jail.h) EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .endif .include .if defined(WITH_DEBUG) MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" .endif .if defined(WITH_PKG) .if ${WITH_PKG} == devel IGNORE= WITH_PKG is defined to 'devel', this version is the stable one .endif .if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info) NB_OLDPKGS!= pkg_info 2>/dev/null | wc -l .if exists(${PKG_BIN}) NB_NEWPKGS!= ${PKG_INFO} -aq | wc -l .else NB_NEWPKGS= 0 .endif # Only show the pre-everything notice if they have not already # converted any packages .if ${NB_OLDPKGS} > 0 && ${NB_NEWPKGS} == 0 && !defined(UPGRADEPKG) pre-everything:: @${ECHO_CMD} "You are about to convert your system to pkg while you have ports/packages"; \ ${ECHO_CMD} "installed with the old pkg_install tools."; \ ${ECHO_CMD} ""; \ ${ECHO_CMD} "To switch to pkg:"; \ ${ECHO_CMD} " 1) Install ports-mgmt/pkg"; \ ${ECHO_CMD} " cd ports-mgmt/pkg && make UPGRADEPKG=1 install clean"; \ ${ECHO_CMD} " 2) Convert your package database by running pkg2ng"; \ ${ECHO_CMD} ""; \ exit 1 .endif .endif .endif #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) PKG_DEPENDS= .undef INSTALLS_DEPENDS # Use the internal pkg instead, generally, unless this is a cross-build, # in which case that won't work. Hope for the best then. .if !defined(CROSS_TOOLCHAIN) PKG_BIN= ${WRKSRC}/src/pkg-static .endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS .include diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo index f51b8eea82cf..ce04438858eb 100644 --- a/ports-mgmt/pkg/distinfo +++ b/ports-mgmt/pkg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688630335 -SHA256 (freebsd-pkg-1.20.1_GH0.tar.gz) = b8b245f41640ffefe7d45d3cc3f8d5642427e969ab9594e3de8281637e6ca890 -SIZE (freebsd-pkg-1.20.1_GH0.tar.gz) = 8242190 +TIMESTAMP = 1688991315 +SHA256 (freebsd-pkg-1.20.2_GH0.tar.gz) = 9b2db7ea6be375bafde8be35930440d681f2846028ff2384d766dc9b48a1f80e +SIZE (freebsd-pkg-1.20.2_GH0.tar.gz) = 8242398 diff --git a/ports-mgmt/pkg/files/patch-add-reduce-memory b/ports-mgmt/pkg/files/patch-add-reduce-memory deleted file mode 100644 index a88f29ec9dc5..000000000000 --- a/ports-mgmt/pkg/files/patch-add-reduce-memory +++ /dev/null @@ -1,13 +0,0 @@ -diff --git libpkg/pkg_add.c libpkg/pkg_add.c -index bac5d949..3512bd66 100644 ---- libpkg/pkg_add.c -+++ libpkg/pkg_add.c -@@ -1047,7 +1047,7 @@ pkg_add_check_pkg_archive(struct pkgdb *db, struct pkg *pkg, - for (int i = 0; i repopath = xstrdup(g.gl_pathv[i]); - tll_push_back(localpkgs, p);