[wip] mail/courier-authlib update

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

[wip] mail/courier-authlib update

Giovanni Bechis-7
Hi,
I was going to update mail/courier-authlib but I found that, even the version
we have in tree, gives an error make lib-depends-check:

courier-authlib-0.68.0p5(mail/courier-authlib,-main):
Missing: z.5 (/usr/local/lib/libauthsqlite.so.0.0) (system lib)
Extra:  iconv.6 idn.18 intl.6
WANTLIB += z

courier-authlib-mysql-0.68.0p3(mail/courier-authlib,-mysql):
Missing: iconv.6 from libiconv-1.14p3 (/usr/local/lib/libauthmysql.so.0.0)
Missing: mariadb.28 from mariadb-client-10.3.15v1 (/usr/local/lib/libauthmysql.so.0.0)
Extra:  mysqlclient.28
WANTLIB += iconv mariadb

The second one depends on databases/mariadb update and it's easily fixable
but what about the first one ?
Should I remove gettext,-runtime and libidn from dependencies ? I am not sure this
is the way to go.
 Cheers
  Giovanni

Reply | Threaded
Open this post in threaded view
|

Re: [wip] mail/courier-authlib update

Jeremie Courreges-Anglas-2
On Thu, Jun 20 2019, Giovanni Bechis <[hidden email]> wrote:

> Hi,
> I was going to update mail/courier-authlib but I found that, even the version
> we have in tree, gives an error make lib-depends-check:
>
> courier-authlib-0.68.0p5(mail/courier-authlib,-main):
> Missing: z.5 (/usr/local/lib/libauthsqlite.so.0.0) (system lib)
> Extra:  iconv.6 idn.18 intl.6
> WANTLIB += z
>
> courier-authlib-mysql-0.68.0p3(mail/courier-authlib,-mysql):
> Missing: iconv.6 from libiconv-1.14p3 (/usr/local/lib/libauthmysql.so.0.0)
> Missing: mariadb.28 from mariadb-client-10.3.15v1 (/usr/local/lib/libauthmysql.so.0.0)
> Extra:  mysqlclient.28
> WANTLIB += iconv mariadb
>
> The second one depends on databases/mariadb update and it's easily fixable
> but what about the first one ?
> Should I remove gettext,-runtime and libidn from dependencies ? I am not sure this
> is the way to go.

This:
--8<--

# statically linked
WANTLIB-main+= iconv idn intl
LIB_DEPENDS-main+= devel/gettext \
                        devel/libidn
-->8--

was added by sthen in

--8<--
revision 1.66
date: 2017/08/15 11:11:40;  author: sthen;  state: Exp;  lines: +8 -4;  commitid: vmUiQQV4Jazzk0G7;
Add missing devel/libidn dependency. List the statically linked libraries
in WANTLIB+LIB_DEPENDS with a warning comment, to encourage pkg_add to update
courier-authlib when there are changes to the libs. ok giovanni@ (maintainer)
-->8--

IIUC libidn is only used by librfc822.a, which in turn is only used
to statically compile the "reftest" and "testsuite" tests.  Neither this
static library nor said programs are installed, so I'd suggest to remove
gettext from deps (it isn't directly used), moving libidn to
BUILD_DEPENDS and amending WANTLIB-main.

Stuart, what do you think?

By the way, I'm not sure the intltool module is needed either.

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: [wip] mail/courier-authlib update

Stuart Henderson
On 2019/06/22 01:36, Jeremie Courreges-Anglas wrote:

> On Thu, Jun 20 2019, Giovanni Bechis <[hidden email]> wrote:
> > Hi,
> > I was going to update mail/courier-authlib but I found that, even the version
> > we have in tree, gives an error make lib-depends-check:
> >
> > courier-authlib-0.68.0p5(mail/courier-authlib,-main):
> > Missing: z.5 (/usr/local/lib/libauthsqlite.so.0.0) (system lib)
> > Extra:  iconv.6 idn.18 intl.6
> > WANTLIB += z
> >
> > courier-authlib-mysql-0.68.0p3(mail/courier-authlib,-mysql):
> > Missing: iconv.6 from libiconv-1.14p3 (/usr/local/lib/libauthmysql.so.0.0)
> > Missing: mariadb.28 from mariadb-client-10.3.15v1 (/usr/local/lib/libauthmysql.so.0.0)
> > Extra:  mysqlclient.28
> > WANTLIB += iconv mariadb
> >
> > The second one depends on databases/mariadb update and it's easily fixable
> > but what about the first one ?
> > Should I remove gettext,-runtime and libidn from dependencies ? I am not sure this
> > is the way to go.
>
> This:
> --8<--
>
> # statically linked
> WANTLIB-main+= iconv idn intl
> LIB_DEPENDS-main+= devel/gettext \
> devel/libidn
> -->8--
>
> was added by sthen in
>
> --8<--
> revision 1.66
> date: 2017/08/15 11:11:40;  author: sthen;  state: Exp;  lines: +8 -4;  commitid: vmUiQQV4Jazzk0G7;
> Add missing devel/libidn dependency. List the statically linked libraries
> in WANTLIB+LIB_DEPENDS with a warning comment, to encourage pkg_add to update
> courier-authlib when there are changes to the libs. ok giovanni@ (maintainer)
> -->8--
>
> IIUC libidn is only used by librfc822.a, which in turn is only used
> to statically compile the "reftest" and "testsuite" tests.  Neither this
> static library nor said programs are installed, so I'd suggest to remove
> gettext from deps (it isn't directly used), moving libidn to
> BUILD_DEPENDS and amending WANTLIB-main.
>
> Stuart, what do you think?

In the current version of the port that is correct. I haven't checked
whether that is still the case in the updated version.

Looks like it's the same situation for libcourier-unicode. I think libidn
and libcourier-unicode should be handled the same way in the port, preferably
with a nice comment (and re-check that this is still the case when updating),
and since these aren't installed BUILD_DEPENDS makes sense.

> By the way, I'm not sure the intltool module is needed either.

agreed.


Reply | Threaded
Open this post in threaded view
|

Re: [wip] mail/courier-authlib update

Giovanni Bechis-7
On 6/24/19 5:42 PM, Stuart Henderson wrote:

> On 2019/06/22 01:36, Jeremie Courreges-Anglas wrote:
>> On Thu, Jun 20 2019, Giovanni Bechis <[hidden email]> wrote:
>>> Hi,
>>> I was going to update mail/courier-authlib but I found that, even the version
>>> we have in tree, gives an error make lib-depends-check:
>>>
>>> courier-authlib-0.68.0p5(mail/courier-authlib,-main):
>>> Missing: z.5 (/usr/local/lib/libauthsqlite.so.0.0) (system lib)
>>> Extra:  iconv.6 idn.18 intl.6
>>> WANTLIB += z
>>>
>>> courier-authlib-mysql-0.68.0p3(mail/courier-authlib,-mysql):
>>> Missing: iconv.6 from libiconv-1.14p3 (/usr/local/lib/libauthmysql.so.0.0)
>>> Missing: mariadb.28 from mariadb-client-10.3.15v1 (/usr/local/lib/libauthmysql.so.0.0)
>>> Extra:  mysqlclient.28
>>> WANTLIB += iconv mariadb
>>>
>>> The second one depends on databases/mariadb update and it's easily fixable
>>> but what about the first one ?
>>> Should I remove gettext,-runtime and libidn from dependencies ? I am not sure this
>>> is the way to go.
>>
>> This:
>> --8<--
>>
>> # statically linked
>> WANTLIB-main+= iconv idn intl
>> LIB_DEPENDS-main+= devel/gettext \
>> devel/libidn
>> -->8--
>>
>> was added by sthen in
>>
>> --8<--
>> revision 1.66
>> date: 2017/08/15 11:11:40;  author: sthen;  state: Exp;  lines: +8 -4;  commitid: vmUiQQV4Jazzk0G7;
>> Add missing devel/libidn dependency. List the statically linked libraries
>> in WANTLIB+LIB_DEPENDS with a warning comment, to encourage pkg_add to update
>> courier-authlib when there are changes to the libs. ok giovanni@ (maintainer)
>> -->8--
>>
>> IIUC libidn is only used by librfc822.a, which in turn is only used
>> to statically compile the "reftest" and "testsuite" tests.  Neither this
>> static library nor said programs are installed, so I'd suggest to remove
>> gettext from deps (it isn't directly used), moving libidn to
>> BUILD_DEPENDS and amending WANTLIB-main.
>>
>> Stuart, what do you think?
>
> In the current version of the port that is correct. I haven't checked
> whether that is still the case in the updated version.
>
> Looks like it's the same situation for libcourier-unicode. I think libidn
> and libcourier-unicode should be handled the same way in the port, preferably
> with a nice comment (and re-check that this is still the case when updating),
> and since these aren't installed BUILD_DEPENDS makes sense.
>
>> By the way, I'm not sure the intltool module is needed either.
>
> agreed.
>
>
This updated diff works and I have no warnings.
comments ? ok ?
  Cheers
   Giovanni

Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- Makefile 20 May 2019 22:15:15 -0000 1.76
+++ Makefile 1 Jul 2019 12:44:42 -0000
@@ -6,9 +6,7 @@ COMMENT-mysql= mysql authentication mod
 COMMENT-pgsql= pgsql authentication module for courier-authLib
 COMMENT-userdb= userdb authentication module for courier-authLib
 
-DISTNAME= courier-authlib-0.68.0
-REVISION= 3
-REVISION-main= 5
+DISTNAME= courier-authlib-0.69.0
 PKGNAME-main= ${DISTNAME}
 PKGNAME-ldap= ${DISTNAME:S/lib-/lib-ldap-/}
 PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/}
@@ -42,7 +40,6 @@ COMPILER = base-clang ports-gcc base-gc
 
 USE_GMAKE= Yes
 AUTOCONF_VERSION= 2.69
-# only libs/rfc822/configure.ac is patched
 AUTOCONF_DIR= ${WRKSRC}/libs/rfc822
 CONFIGURE_STYLE= autoconf
 
@@ -75,12 +72,11 @@ CONFIGURE_ARGS+= --enable-static \
 
 RUN_DEPENDS-main= lang/expect
 BUILD_DEPENDS= lang/expect \
+ devel/libidn \
  mail/courier-unicode>=2.0
 
 DOCS= COPYING COPYING.GPL INSTALL NEWS README
 
-MODULES= textproc/intltool
-
 MULTI_PACKAGES= -main -ldap -mysql -pgsql -userdb
 PSEUDO_FLAVORS= no_ldap no_mysql no_pgsql no_userdb
 FLAVOR?=
@@ -92,9 +88,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
  devel/libtool,-ltdl
 
 # statically linked
-WANTLIB-main+= iconv idn intl
-LIB_DEPENDS-main+= devel/gettext,-runtime \
- devel/libidn
+WANTLIB-main+= z
 
 WANTLIB-ldap= crypto ssl courierauthcommon courierauth \
  m ldap-2.4 lber-2.4 sasl2 ${COMPILER_LIBCXX}
@@ -104,7 +98,7 @@ LIB_DEPENDS-ldap= ${BUILD_PKGPATH} \
  security/cyrus-sasl2
 
 WANTLIB-mysql= crypto m ssl z courierauthcommon courierauth \
- mysqlclient pthread ${COMPILER_LIBCXX}
+ iconv mariadb pthread ${COMPILER_LIBCXX}
 RUN_DEPENDS-mysql=
 LIB_DEPENDS-mysql= ${BUILD_PKGPATH} \
  databases/mariadb
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 4 Aug 2017 23:14:32 -0000 1.11
+++ distinfo 1 Jul 2019 12:44:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (courier-authlib-0.68.0.tar.bz2) = kJYRiCOrq/rI9Goac5N2WkFOo2KMlBO/ujmvXXD9Pi4=
-SIZE (courier-authlib-0.68.0.tar.bz2) = 2194982
+SHA256 (courier-authlib-0.69.0.tar.bz2) = +77Cg+Ygs+Wqs73rDseB3zxlbVERaL+iPsafIa9Etok=
+SIZE (courier-authlib-0.69.0.tar.bz2) = 2197718
Index: patches/patch-libs_rfc822_configure_ac
===================================================================
RCS file: patches/patch-libs_rfc822_configure_ac
diff -N patches/patch-libs_rfc822_configure_ac
--- patches/patch-libs_rfc822_configure_ac 26 Sep 2017 16:14:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-libs_rfc822_configure_ac,v 1.1 2017/09/26 16:14:07 giovanni Exp $
-
-Index: libs/rfc822/configure.ac
---- libs/rfc822/configure.ac.orig
-+++ libs/rfc822/configure.ac
-@@ -64,23 +64,13 @@ AC_CACHE_CHECK([how to calculate alternate timezone],l
- AC_TRY_COMPILE([
- #include <time.h>
- ],[
--int main()
--{
- time_t t=altzone;
--
-- return (0);
--}
- ], librfc822_cv_SYS_TIMEZONE=altzone,
-
- AC_TRY_COMPILE([
- #include <time.h>
- ],[
--int main()
--{
- int n=daylight;
--
-- return (0);
--}
- ], librfc822_cv_SYS_TIMEZONE=daylight,
-
- AC_TRY_COMPILE([
-@@ -88,12 +78,7 @@ int n=daylight;
-
- extern struct tm dummy;
- ],[
--int main()
--{
- long n=dummy.tm_gmtoff;
--
-- return (0);
--}
- ] ,librfc822_cv_SYS_TIMEZONE=tm_gmtoff,
- librfc822_cv_SYS_TIMEZONE=unknown
- )
Index: pkg/PLIST-ldap
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/pkg/PLIST-ldap,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-ldap
--- pkg/PLIST-ldap 23 Mar 2016 12:12:26 -0000 1.3
+++ pkg/PLIST-ldap 1 Jul 2019 12:44:42 -0000
@@ -7,4 +7,3 @@ share/examples/courier-authlib/authldap.
 share/examples/courier-authlib/authldaprc.dist
 @mode 600
 @sample ${SYSCONFDIR}/courier/authldaprc
-@mode
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- pkg/PLIST-main 23 Mar 2016 12:12:26 -0000 1.9
+++ pkg/PLIST-main 1 Jul 2019 12:44:42 -0000
@@ -3,6 +3,8 @@
 @pkgpath mail/courier-authlib
 @newgroup _courier:571
 @newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
+@sample ${SYSCONFDIR}/courier/
+@rcscript ${RCDIR}/courier_authdaemond
 @bin bin/courierauthconfig
 include/courier_auth_config.h
 include/courierauth.h
@@ -62,7 +64,6 @@ share/doc/courier-authlib/INSTALL
 share/doc/courier-authlib/NEWS
 share/doc/courier-authlib/README
 share/examples/courier-authlib/
-@sample ${SYSCONFDIR}/courier/
 share/examples/courier-authlib/authdaemonrc.dist
 @mode 600
 @sample ${SYSCONFDIR}/courier/authdaemonrc
@@ -70,5 +71,3 @@ share/examples/courier-authlib/authdaemo
 share/examples/courier-authlib/authsqliterc.dist
 @mode 600
 @sample ${SYSCONFDIR}/courier/authsqliterc
-@mode
-@rcscript ${RCDIR}/courier_authdaemond
Index: pkg/PLIST-mysql
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/pkg/PLIST-mysql,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-mysql
--- pkg/PLIST-mysql 23 Mar 2016 12:12:26 -0000 1.3
+++ pkg/PLIST-mysql 1 Jul 2019 12:44:42 -0000
@@ -6,4 +6,3 @@ share/doc/courier-authlib/README.authmys
 share/examples/courier-authlib/authmysqlrc.dist
 @mode 600
 @sample ${SYSCONFDIR}/courier/authmysqlrc
-@mode
Index: pkg/PLIST-pgsql
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/pkg/PLIST-pgsql,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-pgsql
--- pkg/PLIST-pgsql 23 Mar 2016 12:12:26 -0000 1.3
+++ pkg/PLIST-pgsql 1 Jul 2019 12:44:42 -0000
@@ -5,4 +5,3 @@
 share/examples/courier-authlib/authpgsqlrc.dist
 @mode 600
 @sample ${SYSCONFDIR}/courier/authpgsqlrc
-@mode
Index: pkg/PLIST-userdb
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/pkg/PLIST-userdb,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-userdb
--- pkg/PLIST-userdb 23 Mar 2016 12:12:26 -0000 1.5
+++ pkg/PLIST-userdb 1 Jul 2019 12:44:42 -0000
@@ -2,13 +2,13 @@
 @comment lib/libauthuserdb.a
 @comment lib/libauthuserdb.la
 @lib lib/libauthuserdb.so.${LIBauthuserdb_VERSION}
+@bin libexec/courier-authlib/makedatprog
 @man man/man8/makeuserdb.8
+@man man/man8/pw2userdb.8
 @man man/man8/userdb.8
 @man man/man8/userdbpw.8
-@man man/man8/pw2userdb.8
 sbin/makeuserdb
 sbin/pw2userdb
 sbin/userdb
 sbin/userdb-test-cram-md5
-@bin libexec/courier-authlib/makedatprog
 @bin sbin/userdbpw
Reply | Threaded
Open this post in threaded view
|

Re: [wip] mail/courier-authlib update

Jeremie Courreges-Anglas-2
On Mon, Jul 01 2019, Giovanni Bechis <[hidden email]> wrote:

> On 6/24/19 5:42 PM, Stuart Henderson wrote:
>> On 2019/06/22 01:36, Jeremie Courreges-Anglas wrote:
>>> On Thu, Jun 20 2019, Giovanni Bechis <[hidden email]> wrote:
>>>> Hi,
>>>> I was going to update mail/courier-authlib but I found that, even the version
>>>> we have in tree, gives an error make lib-depends-check:
>>>>
>>>> courier-authlib-0.68.0p5(mail/courier-authlib,-main):
>>>> Missing: z.5 (/usr/local/lib/libauthsqlite.so.0.0) (system lib)
>>>> Extra:  iconv.6 idn.18 intl.6
>>>> WANTLIB += z
>>>>
>>>> courier-authlib-mysql-0.68.0p3(mail/courier-authlib,-mysql):
>>>> Missing: iconv.6 from libiconv-1.14p3 (/usr/local/lib/libauthmysql.so.0.0)
>>>> Missing: mariadb.28 from mariadb-client-10.3.15v1 (/usr/local/lib/libauthmysql.so.0.0)
>>>> Extra:  mysqlclient.28
>>>> WANTLIB += iconv mariadb
>>>>
>>>> The second one depends on databases/mariadb update and it's easily fixable
>>>> but what about the first one ?
>>>> Should I remove gettext,-runtime and libidn from dependencies ? I am not sure this
>>>> is the way to go.
>>>
>>> This:
>>> --8<--
>>>
>>> # statically linked
>>> WANTLIB-main+= iconv idn intl
>>> LIB_DEPENDS-main+= devel/gettext \
>>> devel/libidn
>>> -->8--
>>>
>>> was added by sthen in
>>>
>>> --8<--
>>> revision 1.66
>>> date: 2017/08/15 11:11:40;  author: sthen;  state: Exp;  lines: +8 -4;  commitid: vmUiQQV4Jazzk0G7;
>>> Add missing devel/libidn dependency. List the statically linked libraries
>>> in WANTLIB+LIB_DEPENDS with a warning comment, to encourage pkg_add to update
>>> courier-authlib when there are changes to the libs. ok giovanni@ (maintainer)
>>> -->8--
>>>
>>> IIUC libidn is only used by librfc822.a, which in turn is only used
>>> to statically compile the "reftest" and "testsuite" tests.  Neither this
>>> static library nor said programs are installed, so I'd suggest to remove
>>> gettext from deps (it isn't directly used), moving libidn to
>>> BUILD_DEPENDS and amending WANTLIB-main.
>>>
>>> Stuart, what do you think?
>>
>> In the current version of the port that is correct. I haven't checked
>> whether that is still the case in the updated version.
>>
>> Looks like it's the same situation for libcourier-unicode. I think libidn
>> and libcourier-unicode should be handled the same way in the port, preferably
>> with a nice comment (and re-check that this is still the case when updating),
>> and since these aren't installed BUILD_DEPENDS makes sense.
>>
>>> By the way, I'm not sure the intltool module is needed either.
>>
>> agreed.
>>
>>
> This updated diff works and I have no warnings.
> comments ? ok ?

LGTM ports-wise, except:
- let's add a comment, as suggested by Stuart
- merge WANTLIB-main lines and zap outdated comment; libz is also
  dynamically linked, else port-lib-depends-check would warn.
- drop CONFIGURE_STYLE = autoconf since no .ac file is patched any more
- regen patches/patch-Makefile_in

With those additional changes, ok jca@


Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- Makefile 20 May 2019 22:15:15 -0000 1.76
+++ Makefile 3 Jul 2019 17:00:15 -0000
@@ -6,9 +6,7 @@ COMMENT-mysql= mysql authentication mod
 COMMENT-pgsql= pgsql authentication module for courier-authLib
 COMMENT-userdb= userdb authentication module for courier-authLib
 
-DISTNAME= courier-authlib-0.68.0
-REVISION= 3
-REVISION-main= 5
+DISTNAME= courier-authlib-0.69.0
 PKGNAME-main= ${DISTNAME}
 PKGNAME-ldap= ${DISTNAME:S/lib-/lib-ldap-/}
 PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/}
@@ -41,10 +39,7 @@ EXTRACT_SUFX= .tar.bz2
 COMPILER = base-clang ports-gcc base-gcc
 
 USE_GMAKE= Yes
-AUTOCONF_VERSION= 2.69
-# only libs/rfc822/configure.ac is patched
-AUTOCONF_DIR= ${WRKSRC}/libs/rfc822
-CONFIGURE_STYLE= autoconf
+CONFIGURE_STYLE= gnu
 
 CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
  LDFLAGS="-L${LOCALBASE}/lib" \
@@ -74,28 +69,23 @@ CONFIGURE_ARGS+= --enable-static \
  --cache-file=${WRKDIR}/courier-authlib.cache
 
 RUN_DEPENDS-main= lang/expect
-BUILD_DEPENDS= lang/expect \
+BUILD_DEPENDS= lang/expect
+# Only used by regress tests
+BUILD_DEPENDS+= devel/libidn \
  mail/courier-unicode>=2.0
 
 DOCS= COPYING COPYING.GPL INSTALL NEWS README
 
-MODULES= textproc/intltool
-
 MULTI_PACKAGES= -main -ldap -mysql -pgsql -userdb
 PSEUDO_FLAVORS= no_ldap no_mysql no_pgsql no_userdb
 FLAVOR?=
 
-WANTLIB-main= c ltdl m pthread sqlite3 ${COMPILER_LIBCXX}
+WANTLIB-main= c ltdl m pthread sqlite3 z ${COMPILER_LIBCXX}
 
 LIB_DEPENDS-main= ${LIB_DEPENDS} \
  databases/sqlite3 \
  devel/libtool,-ltdl
 
-# statically linked
-WANTLIB-main+= iconv idn intl
-LIB_DEPENDS-main+= devel/gettext,-runtime \
- devel/libidn
-
 WANTLIB-ldap= crypto ssl courierauthcommon courierauth \
  m ldap-2.4 lber-2.4 sasl2 ${COMPILER_LIBCXX}
 RUN_DEPENDS-ldap=
@@ -104,7 +94,7 @@ LIB_DEPENDS-ldap= ${BUILD_PKGPATH} \
  security/cyrus-sasl2
 
 WANTLIB-mysql= crypto m ssl z courierauthcommon courierauth \
- mysqlclient pthread ${COMPILER_LIBCXX}
+ iconv mariadb pthread ${COMPILER_LIBCXX}
 RUN_DEPENDS-mysql=
 LIB_DEPENDS-mysql= ${BUILD_PKGPATH} \
  databases/mariadb
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 4 Aug 2017 23:14:32 -0000 1.11
+++ distinfo 3 Jul 2019 17:00:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (courier-authlib-0.68.0.tar.bz2) = kJYRiCOrq/rI9Goac5N2WkFOo2KMlBO/ujmvXXD9Pi4=
-SIZE (courier-authlib-0.68.0.tar.bz2) = 2194982
+SHA256 (courier-authlib-0.69.0.tar.bz2) = +77Cg+Ygs+Wqs73rDseB3zxlbVERaL+iPsafIa9Etok=
+SIZE (courier-authlib-0.69.0.tar.bz2) = 2197718
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/patches/patch-Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Makefile_in
--- patches/patch-Makefile_in 10 Feb 2017 09:40:01 -0000 1.7
+++ patches/patch-Makefile_in 3 Jul 2019 17:00:15 -0000
@@ -1,6 +1,7 @@
 $OpenBSD: patch-Makefile_in,v 1.7 2017/02/10 09:40:01 giovanni Exp $
---- Makefile.in.orig Sat Jan 28 04:00:36 2017
-+++ Makefile.in Fri Feb 10 10:26:23 2017
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
 @@ -688,7 +688,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h authsqliterc.h
 
  DISTCLEANFILES = dbobj.config README_authlib.html
@@ -46,7 +47,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2017/0
  include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
  courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h
 
-@@ -859,7 +859,7 @@ authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommo
+@@ -860,7 +860,7 @@ authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommo
  libs/libhmac/libhmac.la libs/md5/libmd5.la libs/sha1/libsha1.la \
  libs/rfc822/libencode.la libs/numlib/libnumlib.la
 
Index: patches/patch-libs_rfc822_configure_ac
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/patches/patch-libs_rfc822_configure_ac,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libs_rfc822_configure_ac
--- patches/patch-libs_rfc822_configure_ac 26 Sep 2017 16:14:07 -0000 1.1
+++ patches/patch-libs_rfc822_configure_ac 3 Jul 2019 17:00:15 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-libs_rfc822_configure_ac,v 1.1 2017/09/26 16:14:07 giovanni Exp $
-
-Index: libs/rfc822/configure.ac
---- libs/rfc822/configure.ac.orig
-+++ libs/rfc822/configure.ac
-@@ -64,23 +64,13 @@ AC_CACHE_CHECK([how to calculate alternate timezone],l
- AC_TRY_COMPILE([
- #include <time.h>
- ],[
--int main()
--{
- time_t t=altzone;
--
-- return (0);
--}
- ], librfc822_cv_SYS_TIMEZONE=altzone,
-
- AC_TRY_COMPILE([
- #include <time.h>
- ],[
--int main()
--{
- int n=daylight;
--
-- return (0);
--}
- ], librfc822_cv_SYS_TIMEZONE=daylight,
-
- AC_TRY_COMPILE([
-@@ -88,12 +78,7 @@ int n=daylight;
-
- extern struct tm dummy;
- ],[
--int main()
--{
- long n=dummy.tm_gmtoff;
--
-- return (0);
--}
- ] ,librfc822_cv_SYS_TIMEZONE=tm_gmtoff,
- librfc822_cv_SYS_TIMEZONE=unknown
- )
Index: pkg/PLIST-ldap
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/pkg/PLIST-ldap,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-ldap
--- pkg/PLIST-ldap 23 Mar 2016 12:12:26 -0000 1.3
+++ pkg/PLIST-ldap 3 Jul 2019 17:00:15 -0000
@@ -7,4 +7,3 @@ share/examples/courier-authlib/authldap.
 share/examples/courier-authlib/authldaprc.dist
 @mode 600
 @sample ${SYSCONFDIR}/courier/authldaprc
-@mode
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- pkg/PLIST-main 23 Mar 2016 12:12:26 -0000 1.9
+++ pkg/PLIST-main 3 Jul 2019 17:00:15 -0000
@@ -3,6 +3,8 @@
 @pkgpath mail/courier-authlib
 @newgroup _courier:571
 @newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
+@sample ${SYSCONFDIR}/courier/
+@rcscript ${RCDIR}/courier_authdaemond
 @bin bin/courierauthconfig
 include/courier_auth_config.h
 include/courierauth.h
@@ -62,7 +64,6 @@ share/doc/courier-authlib/INSTALL
 share/doc/courier-authlib/NEWS
 share/doc/courier-authlib/README
 share/examples/courier-authlib/
-@sample ${SYSCONFDIR}/courier/
 share/examples/courier-authlib/authdaemonrc.dist
 @mode 600
 @sample ${SYSCONFDIR}/courier/authdaemonrc
@@ -70,5 +71,3 @@ share/examples/courier-authlib/authdaemo
 share/examples/courier-authlib/authsqliterc.dist
 @mode 600
 @sample ${SYSCONFDIR}/courier/authsqliterc
-@mode
-@rcscript ${RCDIR}/courier_authdaemond
Index: pkg/PLIST-mysql
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/pkg/PLIST-mysql,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-mysql
--- pkg/PLIST-mysql 23 Mar 2016 12:12:26 -0000 1.3
+++ pkg/PLIST-mysql 3 Jul 2019 17:00:15 -0000
@@ -6,4 +6,3 @@ share/doc/courier-authlib/README.authmys
 share/examples/courier-authlib/authmysqlrc.dist
 @mode 600
 @sample ${SYSCONFDIR}/courier/authmysqlrc
-@mode
Index: pkg/PLIST-pgsql
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/pkg/PLIST-pgsql,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-pgsql
--- pkg/PLIST-pgsql 23 Mar 2016 12:12:26 -0000 1.3
+++ pkg/PLIST-pgsql 3 Jul 2019 17:00:15 -0000
@@ -5,4 +5,3 @@
 share/examples/courier-authlib/authpgsqlrc.dist
 @mode 600
 @sample ${SYSCONFDIR}/courier/authpgsqlrc
-@mode
Index: pkg/PLIST-userdb
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/pkg/PLIST-userdb,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-userdb
--- pkg/PLIST-userdb 23 Mar 2016 12:12:26 -0000 1.5
+++ pkg/PLIST-userdb 3 Jul 2019 17:00:15 -0000
@@ -2,13 +2,13 @@
 @comment lib/libauthuserdb.a
 @comment lib/libauthuserdb.la
 @lib lib/libauthuserdb.so.${LIBauthuserdb_VERSION}
+@bin libexec/courier-authlib/makedatprog
 @man man/man8/makeuserdb.8
+@man man/man8/pw2userdb.8
 @man man/man8/userdb.8
 @man man/man8/userdbpw.8
-@man man/man8/pw2userdb.8
 sbin/makeuserdb
 sbin/pw2userdb
 sbin/userdb
 sbin/userdb-test-cram-md5
-@bin libexec/courier-authlib/makedatprog
 @bin sbin/userdbpw

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE