Sun Nov 20 01:18:47 2016 UTC ()
pkgtools/pkg: Upgrade version 1.8.7 => 1.9.99.3

This is a development version, but it contains many fixes for NetBSD and
Linux.  It's better than the release version here.


(marino)
diff -r1.17 -r1.18 pkgsrc/pkgtools/pkg/Makefile
diff -r1.8 -r1.9 pkgsrc/pkgtools/pkg/distinfo
diff -r1.1 -r0 pkgsrc/pkgtools/pkg/files/readpassphrase_compat.h
diff -r1.1 -r0 pkgsrc/pkgtools/pkg/patches/patch-external_libfetch_ftp.c
diff -r1.1 -r0 pkgsrc/pkgtools/pkg/patches/patch-external_libfetch_http.c
diff -r1.1 -r0 pkgsrc/pkgtools/pkg/patches/patch-libpkg_pkg.h.in
diff -r1.1 -r0 pkgsrc/pkgtools/pkg/patches/patch-libpkg_pkg__elf.c
cvs diff -r1.17 -r1.18 pkgsrc/pkgtools/pkg/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg/Makefile 2016/11/18 14:10:18 1.17
+++ pkgsrc/pkgtools/pkg/Makefile 2016/11/20 01:18:46 1.18
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.17 2016/11/18 14:10:18 marino Exp $ 1# $NetBSD: Makefile,v 1.18 2016/11/20 01:18:46 marino Exp $
2 2
3DISTNAME= pkg-1.8.7 3DISTNAME= pkg-1.9.99.3
4PKGREVISION= 8 
5CATEGORIES= pkgtools 4CATEGORIES= pkgtools
6MASTER_SITES= http://files.etoilebsd.net/pkg/ 5MASTER_SITES= http://files.etoilebsd.net/pkg/
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= khorben@defora.org 8MAINTAINER= khorben@defora.org
10HOMEPAGE= https://wiki.freebsd.org/pkgng 9HOMEPAGE= https://wiki.freebsd.org/pkgng
11COMMENT= Package management tool for FreeBSD 10COMMENT= Package management tool for FreeBSD
12LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
13 12
14BOOTSTRAP_PKG= yes 13BOOTSTRAP_PKG= yes
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16USE_CWRAPPERS= no 15USE_CWRAPPERS= no
17USE_LANGUAGES= c 16USE_LANGUAGES= c
18 17
19CPPFLAGS+= -D_LOCALBASE="\"${PREFIX}\"" 18CPPFLAGS+= -D_LOCALBASE="\"${PREFIX}\""
20CPPFLAGS+= -DPORTSDIR="\"${PKG.portsdir}\"" 19CPPFLAGS+= -DPORTSDIR="\"${PKG.portsdir}\""
21CPPFLAGS+= -DDEFAULT_VULNXML_URL="\"http://muscles.dragonflybsd.org/pkgsrc-vuxml/vuln.xml.bz2\"" 20CPPFLAGS+= -DDEFAULT_VULNXML_URL="\"http://muscles.dragonflybsd.org/pkgsrc-vuxml/vuln.xml.bz2\""
 21CFLAGS+= -DSYSCONFDIR=\"${PKG_SYSCONFDIR}\"
22 22
23.if defined(DEBUG_PKGNG) 23.if defined(DEBUG_PKGNG)
24CFLAGS:= ${CFLAGS:N-O2} -ggdb -O0 24CFLAGS:= ${CFLAGS:N-O2} -ggdb -O0
25_STRIPFLAG_INSTALL= # don't strip 25_STRIPFLAG_INSTALL= # don't strip
26.endif 26.endif
27 27
28AUTO_MKDIRS= yes 28AUTO_MKDIRS= yes
29 29
30EGDIR= ${PREFIX}/share/examples/pkg 30EGDIR= ${PREFIX}/share/examples/pkg
31 31
32CONF_FILES+= ${EGDIR}/bash_completion.d/_pkg.bash \ 32CONF_FILES+= ${EGDIR}/bash_completion.d/_pkg.bash \
33 ${PKG_SYSCONFDIR}/bash_completion.d/_pkg.bash 33 ${PKG_SYSCONFDIR}/bash_completion.d/_pkg.bash
34CONF_FILES+= ${EGDIR}/periodic/daily/411.pkg-backup \ 34CONF_FILES+= ${EGDIR}/periodic/daily/411.pkg-backup \
@@ -82,49 +82,39 @@ SUBST_CLASSES+= config @@ -82,49 +82,39 @@ SUBST_CLASSES+= config
82SUBST_STAGE.config= post-patch 82SUBST_STAGE.config= post-patch
83SUBST_FILES.config= libpkg/pkg_config.c 83SUBST_FILES.config= libpkg/pkg_config.c
84SUBST_SED.config= -e "s|/usr/ports|${PKG.portsdir}|g" \ 84SUBST_SED.config= -e "s|/usr/ports|${PKG.portsdir}|g" \
85 -e "s|/var/db/pkg|${PKGNG_DBDIR}|g" \ 85 -e "s|/var/db/pkg|${PKGNG_DBDIR}|g" \
86 -e "s|/var/cache/pkg|${VARBASE}/cache/pkgng|g" 86 -e "s|/var/cache/pkg|${VARBASE}/cache/pkgng|g"
87SUBST_MESSAGE.config= Update pkg(8) defaults. 87SUBST_MESSAGE.config= Update pkg(8) defaults.
88 88
89SUBST_CLASSES+= vuxml 89SUBST_CLASSES+= vuxml
90SUBST_STAGE.vuxml= post-patch 90SUBST_STAGE.vuxml= post-patch
91SUBST_FILES.vuxml= libpkg/pkg_audit.c 91SUBST_FILES.vuxml= libpkg/pkg_audit.c
92SUBST_SED.vuxml= -e "s|https://vuxml.FreeBSD.org/freebsd|http://muscles.dragonflybsd.org/pkgsrc-vuxml/reports|" 92SUBST_SED.vuxml= -e "s|https://vuxml.FreeBSD.org/freebsd|http://muscles.dragonflybsd.org/pkgsrc-vuxml/reports|"
93SUBST_MESSAGE.vuxml= Direct audit reports to Pkgsrc vuxml 93SUBST_MESSAGE.vuxml= Direct audit reports to Pkgsrc vuxml
94 94
95SUBST_CLASSES+= ldhints 
96SUBST_STAGE.ldhints= post-patch 
97SUBST_FILES.ldhints= libpkg/private/ldconfig.h libpkg/elfhints.c 
98SUBST_SED.ldhints= -e "s|/var/run/ld-elf.so.hints|/var/run/ld.so.hints|" \ 
99 -e 's,ifndef __linux__,if defined __FreeBSD__ || defined __DragonFly__,' 
100SUBST_MESSAGE.ldhints= Disable ldconfig hints for NetBSD 
101 
102.if defined(PACKAGE_BUILDING) # set by Synth which has custom location, so use default path 95.if defined(PACKAGE_BUILDING) # set by Synth which has custom location, so use default path
103PKG.portsdir?= /usr/pkgsrc 96PKG.portsdir?= /usr/pkgsrc
104.else 97.else
105PKG.portsdir?= ${PKGSRCDIR} 98PKG.portsdir?= ${PKGSRCDIR}
106.endif 99.endif
107 100
108# DragonFly SSL libraries are private. pkg(8) is the one exception of a userland 101# DragonFly SSL libraries are private. pkg(8) is the one exception of a userland
109# program that is allowed to link to them due to bootstrap reasons 102# program that is allowed to link to them due to bootstrap reasons
110.if exists(/usr/lib/priv/libprivate_ssl.so) 103.if exists(/usr/lib/priv/libprivate_ssl.so)
111BUILDLINK_PASSTHRU_RPATHDIRS= /lib/priv 104BUILDLINK_PASSTHRU_RPATHDIRS= /lib/priv
112.endif 105.endif
113 106
114post-patch: 107post-patch:
115 ${CP} ${FILESDIR}/readpassphrase_compat.h \ 
116 ${WRKSRC}/src/ 
117 
118# DragonFly SSL libraries are private. 108# DragonFly SSL libraries are private.
119.if exists(/usr/lib/priv/libprivate_ssl.so) 109.if exists(/usr/lib/priv/libprivate_ssl.so)
120 ${SED} -i.bak \ 110 ${SED} -i.bak \
121 -e 's|lssl|lprivate_ssl|' \ 111 -e 's|lssl|lprivate_ssl|' \
122 -e 's|lcrypto|lprivate_crypto|' \ 112 -e 's|lcrypto|lprivate_crypto|' \
123 -e 's|la_rpath = |la_rpath = -R/lib/priv |' \ 113 -e 's|la_rpath = |la_rpath = -R/lib/priv |' \
124 ${WRKSRC}/libpkg/Makefile.in \ 114 ${WRKSRC}/libpkg/Makefile.in \
125 ${WRKSRC}/src/Makefile.in \ 115 ${WRKSRC}/src/Makefile.in \
126 ${WRKSRC}/tests/Makefile.in 116 ${WRKSRC}/tests/Makefile.in
127 ${SED} -i.bak \ 117 ${SED} -i.bak \
128 -e '/OS_CFLAGS=/ s|SOURCE|SOURCE -I/usr/include/priv|' \ 118 -e '/OS_CFLAGS=/ s|SOURCE|SOURCE -I/usr/include/priv|' \
129 -e '/OS_LDFLAGS=/ s|=|="-L/usr/lib/priv -R/lib/priv"|' \ 119 -e '/OS_LDFLAGS=/ s|=|="-L/usr/lib/priv -R/lib/priv"|' \
130 ${WRKSRC}/configure 120 ${WRKSRC}/configure
cvs diff -r1.8 -r1.9 pkgsrc/pkgtools/pkg/distinfo (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg/distinfo 2016/11/15 17:48:56 1.8
+++ pkgsrc/pkgtools/pkg/distinfo 2016/11/20 01:18:46 1.9
@@ -1,11 +1,7 @@ @@ -1,11 +1,7 @@
1$NetBSD: distinfo,v 1.8 2016/11/15 17:48:56 marino Exp $ 1$NetBSD: distinfo,v 1.9 2016/11/20 01:18:46 marino Exp $
2 2
3SHA1 (pkg-1.8.7.tar.xz) = 4727c25b0e4c34df1bf7a00df0e9c6370e855416 3SHA1 (pkg-1.9.99.3.tar.xz) = 89a75e19cccda903ca74e1f44c5bbd03ae32fee3
4RMD160 (pkg-1.8.7.tar.xz) = f0087c0e88ef890300a46a28d0644926fa7a7acb 4RMD160 (pkg-1.9.99.3.tar.xz) = 9bab612c3def26b4b9e1124f5c04fbd3762a584c
5SHA512 (pkg-1.8.7.tar.xz) = 61b1553cb444ba30bcf1c9a5da204ff29b08ad87641c3f49fb7e7efd9f5396742e6812bf96a0228d3e76916648511faa086d197cc41c2ced9979615e23a3bc43 5SHA512 (pkg-1.9.99.3.tar.xz) = 602b5d8cbe1e55a1539cfb68045c061c17c20f8cf1705ba14dfac9b889840be48b21d5e452ab69c51636f1708df89b16636c5f807812f28e739f76caa2fc93d7
6Size (pkg-1.8.7.tar.xz) = 1950148 bytes 6Size (pkg-1.9.99.3.tar.xz) = 1918096 bytes
7SHA1 (patch-docs_Makefile.am) = aa6d5c9310c644d13d55c3176cd186c37cccc7c2 7SHA1 (patch-docs_Makefile.am) = aa6d5c9310c644d13d55c3176cd186c37cccc7c2
8SHA1 (patch-external_libfetch_ftp.c) = f0080c4bd59386ab2a4ee015f6b22d4d228d7869 
9SHA1 (patch-external_libfetch_http.c) = 9e618f80d6d72af7011351a8903b83f73130cdba 
10SHA1 (patch-libpkg_pkg.h.in) = e74a96513c1e74ddea8a5b05b080cef57976d68b 
11SHA1 (patch-libpkg_pkg__elf.c) = 07174f421e162fc74f1c2b306f60da1273b8b6ec 
File Deleted: pkgsrc/pkgtools/pkg/files/Attic/readpassphrase_compat.h
File Deleted: pkgsrc/pkgtools/pkg/patches/Attic/patch-external_libfetch_ftp.c
File Deleted: pkgsrc/pkgtools/pkg/patches/Attic/patch-external_libfetch_http.c
File Deleted: pkgsrc/pkgtools/pkg/patches/Attic/patch-libpkg_pkg.h.in
File Deleted: pkgsrc/pkgtools/pkg/patches/Attic/patch-libpkg_pkg__elf.c