diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-12-10 15:44:42 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-12-10 15:44:42 +0000 |
| commit | 0041687f768145478c6c2158fccb42f3fc8833e0 (patch) | |
| tree | fd58d10b29eb0755553bbb4fb99bb7f946e4c113 /ports-mgmt | |
| parent | - Add proper Comment for files/aop.desktop (diff) | |
Update to pkg 1.2.3
Changes:
- Workaround a bug in bsd.*.mk on FreeBSD 8.x
- Fix a pkg repo segfault
- Document aliases in pkg.conf(5)
- Be more verbose when refusing a repository configuration file
- Sync libucl with upstream (bug fixes)
- Fix a fd leak in pkg repo
- Fix memory leaks due bad usage of libarchive
Notes
Notes:
svn path=/head/; revision=336063
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg-devel/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/pkg-devel/distinfo | 4 | ||||
| -rw-r--r-- | ports-mgmt/pkg-devel/files/patch-libpkg__Makefile | 14 | ||||
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/pkg/distinfo | 4 | ||||
| -rw-r--r-- | ports-mgmt/pkg/files/patch-libpkg__Makefile | 14 |
6 files changed, 6 insertions, 34 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index 886780644ef9..78d679750bda 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.2.2 +DISTVERSION= 1.2.3 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo index 3e4414fa8b6e..51dcfcabbf65 100644 --- a/ports-mgmt/pkg-devel/distinfo +++ b/ports-mgmt/pkg-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (pkg-1.2.2.tar.xz) = f02dad746653447284861e52c38ce31a3e207ac909c6c1f9dbcaabd1c79e1688 -SIZE (pkg-1.2.2.tar.xz) = 1807456 +SHA256 (pkg-1.2.3.tar.xz) = a84e00b9c5153beab4122fdc01735cc6829c3dc83c6e9ab335bb09b32468ef27 +SIZE (pkg-1.2.3.tar.xz) = 1807516 diff --git a/ports-mgmt/pkg-devel/files/patch-libpkg__Makefile b/ports-mgmt/pkg-devel/files/patch-libpkg__Makefile deleted file mode 100644 index 8cd27109f71b..000000000000 --- a/ports-mgmt/pkg-devel/files/patch-libpkg__Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- ./libpkg/Makefile.orig 2013-12-06 10:09:09.945131112 -0600 -+++ ./libpkg/Makefile 2013-12-06 10:10:36.944131558 -0600 -@@ -255,3 +255,11 @@ - sed -e "s,__PREFIX__,${PREFIX},g" \ - -e "s,__VERSION__,${PKGVERSION},g" \ - ${.IMPSRC} > ${.TARGET} -+ -+# Workaround 8.3/8.4 bug -+OSVERSION!= /sbin/sysctl -n kern.osreldate -+ -+.if ${OSVERSION} < 901000 -+.c.o: -+ ${CC} ${STATIC_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} -+.endif diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 95f1c9642279..c6d4c47d62d2 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.2.2 +DISTVERSION= 1.2.3 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo index 3e4414fa8b6e..51dcfcabbf65 100644 --- a/ports-mgmt/pkg/distinfo +++ b/ports-mgmt/pkg/distinfo @@ -1,2 +1,2 @@ -SHA256 (pkg-1.2.2.tar.xz) = f02dad746653447284861e52c38ce31a3e207ac909c6c1f9dbcaabd1c79e1688 -SIZE (pkg-1.2.2.tar.xz) = 1807456 +SHA256 (pkg-1.2.3.tar.xz) = a84e00b9c5153beab4122fdc01735cc6829c3dc83c6e9ab335bb09b32468ef27 +SIZE (pkg-1.2.3.tar.xz) = 1807516 diff --git a/ports-mgmt/pkg/files/patch-libpkg__Makefile b/ports-mgmt/pkg/files/patch-libpkg__Makefile deleted file mode 100644 index 8cd27109f71b..000000000000 --- a/ports-mgmt/pkg/files/patch-libpkg__Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- ./libpkg/Makefile.orig 2013-12-06 10:09:09.945131112 -0600 -+++ ./libpkg/Makefile 2013-12-06 10:10:36.944131558 -0600 -@@ -255,3 +255,11 @@ - sed -e "s,__PREFIX__,${PREFIX},g" \ - -e "s,__VERSION__,${PKGVERSION},g" \ - ${.IMPSRC} > ${.TARGET} -+ -+# Workaround 8.3/8.4 bug -+OSVERSION!= /sbin/sysctl -n kern.osreldate -+ -+.if ${OSVERSION} < 901000 -+.c.o: -+ ${CC} ${STATIC_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} -+.endif |