On 2017/08/15 11:18, Giovanni Bechis wrote:
> On Fri, Aug 11, 2017 at 05:10:55PM +0100, Stuart Henderson wrote:
> > On 2017/08/11 17:52, Giovanni Bechis wrote:
> > > On 08/11/17 17:45, Giovanni Bechis wrote:
> > > > On 08/11/17 13:21, Stuart Henderson wrote:
> > > >> On 2017/07/26 15:42, Giovanni Bechis wrote:
> > > >>> Hi,
> > > >>> update to courier stuff, is it ok with COMPILER additions (c++11
> > > >>> needed) ?
> > > >>> Cheers
> > > >>> Giovanni
> > > >>
> > > >> courier-authlib failed in bulk:
> > > >>
> > > >> gmake[3]: Entering directory
> > > >> '/usr/obj/ports/courier-authlib-0.68.0/courier-authlib-0.68.0/libs/rfc822'
> > > >> /usr/bin/libtool --tag=CC --mode=compile cc -DHAVE_CONFIG_H -I.
> > > >> -I/usr/local/include -I/usr/local/include -O2 -pipe -Wall -I.. -I./..
> > > >> -MT rfc2047u.lo -MD -MP -MF .deps/rfc2047u.Tpo -c -o rfc2047u.lo
> > > >> rfc2047u.c
> > > >> cc -DHAVE_CONFIG_H -I. -I/usr/local/include -I/usr/local/include -O2
> > > >> -pipe -Wall -I.. -I./.. -MT rfc2047u.lo -MD -MP -MF .deps/rfc2047u.Tpo
> > > >> -c rfc2047u.c -fPIC -DPIC -o .libs/rfc2047u.o
> > > >> rfc2047u.c:18:10: fatal error: 'idna.h' file not found
> > > >> #include <idna.h>
> > > >> ^~~~~~~~
> > > >> 1 error generated.
> > > >>
> > > > missing dependency, I will commit it next week is faster.
> > > > Cheers
> > > > Giovanni
> > > >
> > > err, I will commit it next week, please commit if you are faster.
> > > Giovanni
> >
> > I wonder why it's not dynamically linked..
> >
> in latest release upstream started linking gettext and libidna statically
> against librfc822 that it is linked in libcourierauth that is finally
> dynlinked.
> I will ask upstream about that.
> Updated patch.
> Giovanni
> Index: Makefile
> ===================================================================
> RCS file: /var/cvs/ports/mail/courier-authlib/Makefile,v
> retrieving revision 1.65
> diff -u -p -r1.65 Makefile
> --- Makefile 9 Aug 2017 20:36:40 -0000 1.65
> +++ Makefile 15 Aug 2017 09:17:54 -0000
> @@ -7,7 +7,7 @@ COMMENT-pgsql= pgsql authentication mod
> COMMENT-userdb= userdb authentication module for courier-authLib
>
> DISTNAME= courier-authlib-0.68.0
> -REVISION= 0
> +REVISION= 1
> PKGNAME-main= ${DISTNAME}
> PKGNAME-ldap= ${DISTNAME:S/lib-/lib-ldap-/}
> PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/}
> @@ -68,7 +68,9 @@ CONFIGURE_ARGS+= --enable-static \
> --cache-file=${WRKDIR}/courier-authlib.cache
>
> RUN_DEPENDS-main= lang/expect
> -BUILD_DEPENDS= lang/expect \
> +BUILD_DEPENDS= devel/gettext \
> + devel/libidn \
> + lang/expect \
> mail/courier-unicode>=2.0
>
> DOCS= COPYING COPYING.GPL INSTALL NEWS README
> @@ -79,10 +81,9 @@ MULTI_PACKAGES= -main -ldap -mysql -pgs
> PSEUDO_FLAVORS= no_ldap no_mysql no_pgsql no_userdb
> FLAVOR?=
>
> -WANTLIB-main= c iconv intl ltdl m pthread sqlite3
> ${COMPILER_LIBCXX}
> +WANTLIB-main= c ltdl m pthread sqlite3 ${COMPILER_LIBCXX}
>
> LIB_DEPENDS-main= databases/sqlite3 \
> - devel/gettext \
> devel/libtool,-ltdl
>
> WANTLIB-ldap= crypto ssl courierauthcommon courierauth \
I would prefer to list these as LIB_DEPENDS and WANTLIB, with a warning
comment next to the WANTLIB to say that they're statically linked (i.e.
it will show as "extra" in check-lib-depends and people shouldn't remove
them). This would mean that security/etc fixes to libidn will trigger
an update of the courier-authlib package (otherwise authlib would need
a separate manual bump). Like this.. what do you think?
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile 9 Aug 2017 20:36:40 -0000 1.65
+++ Makefile 15 Aug 2017 10:24:35 -0000
@@ -7,7 +7,7 @@ COMMENT-pgsql= pgsql authentication mod
COMMENT-userdb= userdb authentication module for courier-authLib
DISTNAME= courier-authlib-0.68.0
-REVISION= 0
+REVISION= 1
PKGNAME-main= ${DISTNAME}
PKGNAME-ldap= ${DISTNAME:S/lib-/lib-ldap-/}
PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/}
@@ -79,11 +79,15 @@ MULTI_PACKAGES= -main -ldap -mysql -pgs
PSEUDO_FLAVORS= no_ldap no_mysql no_pgsql no_userdb
FLAVOR?=
-WANTLIB-main= c iconv intl ltdl m pthread sqlite3 ${COMPILER_LIBCXX}
+WANTLIB-main= c ltdl m pthread sqlite3 ${COMPILER_LIBCXX}
LIB_DEPENDS-main= databases/sqlite3 \
- devel/gettext \
devel/libtool,-ltdl
+
+# statically linked
+WANTLIB-main+= iconv idn intl
+LIB_DEPENDS-main+= devel/gettext \
+ devel/libidn
WANTLIB-ldap= crypto ssl courierauthcommon courierauth \
m ldap-2.4 lber-2.4 sasl2 ${COMPILER_LIBCXX}
