Date: Sun, 7 Nov 2010 22:23:08 +0100 (CET) From: Joerg Pulz <Joerg.Pulz@frm2.tum.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/152029: [patch] fix dependencies after security/heimdal shlib bump Message-ID: <201011072123.oA7LN8DT016551@hades.admin.frm2> Resent-Message-ID: <201011072130.oA7LUA7T006061@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 152029
>Category: ports
>Synopsis: [patch] fix dependencies after security/heimdal shlib bump
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 07 21:30:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Joerg Pulz
>Release: FreeBSD 8.0-STABLE amd64
>Organization:
TU Muenchen / FRM II
>Environment:
System: FreeBSD hades.admin.frm2 8.0-STABLE FreeBSD 8.0-STABLE #2: Thu Jan 21 12:42:55 CET 2010 root@hades.admin.frm2:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
security/heimdal installs libkrb5.so.26 since the update to 1.4.
Fix all ports which still depend on libkrb5.so.23.
All other ports which can use security/heimdal either use libkrb5.so
without version number or have no dependency at all.
I simply forgot this when preparing and submitting the heimdal-1.4
update. Sorry for that.
As the heimdal dependencies are all optional nothing was broken in the
default package build.
>How-To-Repeat:
>Fix:
--- heimdal_shlib_bump.diff begins here ---
Index: databases/postgresql73-server/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql73-server/Makefile,v
retrieving revision 1.154
diff -u -r1.154 Makefile
--- databases/postgresql73-server/Makefile 13 Jun 2010 08:39:56 -0000 1.154
+++ databases/postgresql73-server/Makefile 7 Nov 2010 21:02:42 -0000
@@ -7,7 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.3.21
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -131,7 +131,7 @@
# Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
# so we always use the heimdal port. See
# http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+= krb5.26:${PORTSDIR}/security/heimdal
CONFIGURE_ARGS+=--with-krb5=${LOCALBASE}
. endif
. endif
Index: databases/postgresql74-server/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql74-server/Makefile,v
retrieving revision 1.164
diff -u -r1.164 Makefile
--- databases/postgresql74-server/Makefile 7 Oct 2010 06:58:08 -0000 1.164
+++ databases/postgresql74-server/Makefile 7 Nov 2010 21:02:43 -0000
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 7.4.30
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -142,7 +143,7 @@
# Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
# so we always use the heimdal port. See
# http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+= krb5.26:${PORTSDIR}/security/heimdal
CONFIGURE_ARGS+=--with-krb5=${LOCALBASE}
. endif
. endif
Index: databases/postgresql80-server/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql80-server/Makefile,v
retrieving revision 1.186
diff -u -r1.186 Makefile
--- databases/postgresql80-server/Makefile 16 Oct 2010 11:51:52 -0000 1.186
+++ databases/postgresql80-server/Makefile 7 Nov 2010 21:02:44 -0000
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 8.0.26
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -161,7 +162,7 @@
# Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
# so we always use the heimdal port. See
# http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+= krb5.26:${PORTSDIR}/security/heimdal
CONFIGURE_ARGS+=--with-krb5
. endif
. endif
Index: databases/postgresql81-server/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql81-server/Makefile,v
retrieving revision 1.191
diff -u -r1.191 Makefile
--- databases/postgresql81-server/Makefile 16 Oct 2010 11:51:52 -0000 1.191
+++ databases/postgresql81-server/Makefile 7 Nov 2010 21:02:45 -0000
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 8.1.22
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -162,7 +163,7 @@
# Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
# so we always use the heimdal port. See
# http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+= krb5.26:${PORTSDIR}/security/heimdal
CONFIGURE_ARGS+=--with-krb5
. endif
. endif
Index: databases/postgresql82-server/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql82-server/Makefile,v
retrieving revision 1.192
diff -u -r1.192 Makefile
--- databases/postgresql82-server/Makefile 16 Oct 2010 11:51:52 -0000 1.192
+++ databases/postgresql82-server/Makefile 7 Nov 2010 21:02:46 -0000
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
PORTVERSION?= 8.2.18
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${PORTVERSION}
@@ -161,7 +162,7 @@
# Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
# so we always use the heimdal port. See
# http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+= krb5.26:${PORTSDIR}/security/heimdal
CONFIGURE_ARGS+=--with-krb5
. endif
. endif
Index: databases/postgresql83-server/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql83-server/Makefile,v
retrieving revision 1.202
diff -u -r1.202 Makefile
--- databases/postgresql83-server/Makefile 16 Oct 2010 11:51:52 -0000 1.202
+++ databases/postgresql83-server/Makefile 7 Nov 2010 21:02:47 -0000
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
DISTVERSION?= 8.3.12
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${DISTVERSION}
@@ -179,7 +180,7 @@
# Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
# so we always use the heimdal port. See
# http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+= krb5.26:${PORTSDIR}/security/heimdal
CONFIGURE_ARGS+=--with-krb5
. endif
. endif
Index: databases/postgresql84-server/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql84-server/Makefile,v
retrieving revision 1.212
diff -u -r1.212 Makefile
--- databases/postgresql84-server/Makefile 16 Oct 2010 11:51:52 -0000 1.212
+++ databases/postgresql84-server/Makefile 7 Nov 2010 21:02:48 -0000
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
DISTVERSION?= 8.4.5
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${DISTVERSION}
@@ -192,7 +193,7 @@
# Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
# so we always use the heimdal port. See
# http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+= krb5.26:${PORTSDIR}/security/heimdal
CONFIGURE_ARGS+=--with-krb5
. endif
. endif
Index: databases/postgresql90-server/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql90-server/Makefile,v
retrieving revision 1.206
diff -u -r1.206 Makefile
--- databases/postgresql90-server/Makefile 26 Oct 2010 12:34:27 -0000 1.206
+++ databases/postgresql90-server/Makefile 7 Nov 2010 21:02:49 -0000
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
DISTVERSION?= 9.0.1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${DISTVERSION}
@@ -198,7 +199,7 @@
# Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
# so we always use the heimdal port. See
# http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+= krb5.26:${PORTSDIR}/security/heimdal
CONFIGURE_ARGS+=--with-krb5
. endif
. endif
Index: net/freeradius/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/freeradius/Makefile,v
retrieving revision 1.77
diff -u -r1.77 Makefile
--- net/freeradius/Makefile 16 Oct 2010 11:52:25 -0000 1.77
+++ net/freeradius/Makefile 7 Nov 2010 21:02:49 -0000
@@ -7,7 +7,7 @@
PORTNAME= freeradius
PORTVERSION?= 1.1.8
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= net
MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
@@ -106,7 +106,7 @@
.ifdef(WITH_KERBEROS)
.ifdef(WITH_HEIMDAL)
-LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+= krb5.26:${PORTSDIR}/security/heimdal
CONFIGURE_ARGS+=--enable-heimdal-krb5
.else
LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5
Index: net/freeradius2/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/freeradius2/Makefile,v
retrieving revision 1.90
diff -u -r1.90 Makefile
--- net/freeradius2/Makefile 21 Oct 2010 23:52:34 -0000 1.90
+++ net/freeradius2/Makefile 7 Nov 2010 21:02:51 -0000
@@ -9,6 +9,7 @@
PORTNAME= freeradius
DISTVERSION= 2.1.10
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
@@ -84,7 +85,7 @@
.ifdef(WITH_KERBEROS)
.ifdef(WITH_HEIMDAL)
-LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+= krb5.26:${PORTSDIR}/security/heimdal
CONFIGURE_ARGS+=--enable-heimdal-krb5
.else
LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5
Index: security/openssh-portable/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/openssh-portable/Makefile,v
retrieving revision 1.149
diff -u -r1.149 Makefile
--- security/openssh-portable/Makefile 31 Aug 2010 02:46:43 -0000 1.149
+++ security/openssh-portable/Makefile 7 Nov 2010 21:02:51 -0000
@@ -7,7 +7,7 @@
PORTNAME= openssh
DISTVERSION= 5.2p1
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= security ipv6
.if defined(OPENSSH_SNAPSHOT)
@@ -119,7 +119,7 @@
CONFLICTS+= openssh-portable-*-[0-9]*
CONFIGURE_ARGS+= --with-kerberos5=${KRB5_HOME}
.if defined(HEIMDAL_HOME) && defined(KRB5_HOME) && ${HEIMDAL_HOME} == ${LOCALBASE}
-LIB_DEPENDS+= krb5.23:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+= krb5.26:${PORTSDIR}/security/heimdal
.elif defined(KRB5_HOME) && defined(LOCALBASE) && ${KRB5_HOME} == ${LOCALBASE}
LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5
.endif
--- heimdal_shlib_bump.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011072123.oA7LN8DT016551>