On 10/27/14 20:25, Stuart Henderson wrote:
> On 2014/10/27 18:59, Giovanni Bechis wrote:
>> DISTNAME= courier-authlib-0.66.1
>> +REVISION= 1
>> PKGNAME-main= ${DISTNAME}
>> PKGNAME-ldap= ${DISTNAME:S/lib-/lib-ldap-/}
>> PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/}
>> PKGNAME-pgsql= ${DISTNAME:S/lib-/lib-pgsql-/}
>> PKGNAME-userdb= ${DISTNAME:S/lib-/lib-userdb-/}
>>
>> -REVISION= 0
>> -REVISION-mysql= 1
>> +REVISION-mysql= 2
>> +REVISION-ldap= 0
>> +REVISION-pgsql= 0
>> +REVISION-userdb= 0
>
> Could you put all of the REVISION variables together please? It will
> reduce the risk of accidents if people bump things later..
> Actually, it might be simpler to just have a single REVISION=2 line
> instead of a bunch of different ones for all the subpackages..you're
> bumping all of them anyway so there's no disadvantage to doing that.
>
>> -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
>> +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lpthread" \
>
> Is it enough to just add -lpthread to authdaemond rather than to
> everything? Like this ..
>
ok with this one ?
REVISION-mysql bumped because of WANTLIB sync.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/mail/courier-authlib/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile 15 Sep 2014 15:18:16 -0000 1.48
+++ Makefile 28 Oct 2014 08:15:46 -0000
@@ -7,15 +7,14 @@ COMMENT-pgsql= pgsql authentication mod
COMMENT-userdb= userdb authentication module for courier-authLib
DISTNAME= courier-authlib-0.66.1
+REVISION= 1
+REVISION-mysql= 2
PKGNAME-main= ${DISTNAME}
PKGNAME-ldap= ${DISTNAME:S/lib-/lib-ldap-/}
PKGNAME-mysql= ${DISTNAME:S/lib-/lib-mysql-/}
PKGNAME-pgsql= ${DISTNAME:S/lib-/lib-pgsql-/}
PKGNAME-userdb= ${DISTNAME:S/lib-/lib-userdb-/}
-REVISION= 0
-REVISION-mysql= 1
-
SHARED_LIBS += courierauth 1.0 # .0.0
SHARED_LIBS += courierauthsasl 1.0 # .0.0
SHARED_LIBS += courierauthsaslclient 0.0 # .0.0
@@ -82,7 +81,7 @@ MULTI_PACKAGES= -main -ldap -mysql -pgs
PSEUDO_FLAVORS= no_ldap no_mysql no_pgsql no_userdb
FLAVOR?=
-WANTLIB-main= c ltdl sqlite3
+WANTLIB-main= c ltdl pthread sqlite3
LIB_DEPENDS-main= devel/libtool,-ltdl
@@ -93,7 +92,8 @@ LIB_DEPENDS-ldap= ${BUILD_PKGPATH} \
databases/openldap \
security/cyrus-sasl2
-WANTLIB-mysql= crypto m ssl z courierauthcommon courierauth mysqlclient
+WANTLIB-mysql= crypto m ssl z courierauthcommon courierauth \
+ mysqlclient pthread stdc++
RUN_DEPENDS-mysql=
LIB_DEPENDS-mysql= ${BUILD_PKGPATH} \
databases/mariadb
Index: patches/patch-Makefile_in
===================================================================
RCS file: /var/cvs/ports/mail/courier-authlib/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 11 Apr 2014 09:35:04 -0000 1.4
+++ patches/patch-Makefile_in 28 Oct 2014 08:01:13 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.4 2014/04/11 09:35:04 giovanni Exp $
--- Makefile.in.orig Mon Nov 11 19:58:27 2013
-+++ Makefile.in Sun Jan 12 17:31:43 2014
++++ Makefile.in Tue Oct 28 09:01:02 2014
@@ -654,7 +654,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h authsqliterc.h
DISTCLEANFILES = dbobj.config README_authlib.html
@@ -46,3 +46,12 @@ $OpenBSD: patch-Makefile_in,v 1.4 2014/0
include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h
+@@ -822,7 +822,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
+
+-authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) @NETLIBS@
++authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) -lpthread @NETLIBS@
+ authdaemontest_SOURCES = authdaemontest.c
+ authdaemontest_DEPENDENCIES = libcourierauthcommon.la
+ authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@
Index: patches/patch-authldap_h
===================================================================
RCS file: patches/patch-authldap_h
diff -N patches/patch-authldap_h
--- patches/patch-authldap_h 18 Oct 2012 08:04:01 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-authldap_h,v 1.4 2012/10/18 08:04:01 giovanni Exp $
---- authldap.h.orig Wed May 25 04:44:12 2011
-+++ authldap.h Fri Sep 7 14:34:02 2012
-@@ -7,6 +7,8 @@
- ** distribution information.
- */
-
-+#define LDAP_DEPRECATED 1
-+
- /* Based on code by Luc Saillard <[email protected]>. */
-
- #if HAVE_CONFIG_H
Index: patches/patch-authldaplib_c
===================================================================
RCS file: patches/patch-authldaplib_c
diff -N patches/patch-authldaplib_c
--- patches/patch-authldaplib_c 25 Jun 2007 12:12:26 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-authldaplib_c,v 1.1 2007/06/25 12:12:26 espie Exp $
---- authldaplib.c.orig Mon Jun 25 12:54:11 2007
-+++ authldaplib.c Mon Jun 25 12:56:10 2007
-@@ -92,6 +92,7 @@ authldap_free_config removed - no longer required.
- #if HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#include "authldap.h"
- #if HAVE_LBER_H
- #include <lber.h>
- #endif
-@@ -108,7 +109,6 @@ authldap_free_config removed - no longer required.
- #include <sys/stat.h>
- #endif
-
--#include "authldap.h"
- #include "auth.h"
- #include "authldaprc.h"
- #include "courierauthdebug.h"
Index: pkg/PLIST-main
===================================================================
RCS file: /var/cvs/ports/mail/courier-authlib/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-main
--- pkg/PLIST-main 25 Jan 2014 13:12:12 -0000 1.7
+++ pkg/PLIST-main 27 Oct 2014 17:51:59 -0000
@@ -41,7 +41,6 @@ libexec/courier-authlib/sysconftool
@man man/man3/auth_login.3
@man man/man3/auth_passwd.3
@man man/man3/auth_sasl.3
-@man man/man3/auth_sasl_ex.3
@man man/man3/authlib.3
sbin/authdaemond
@bin sbin/authenumerate
