cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unbreak after MySQL -> Mariadb switch and remove useless patches.

Browse Source 
hints and ok sthen@
This commit is contained in:
giovanni 2014-10-28 09:19:29 +00:00
parent dc8dbc3d70
commit 11758a8702
4 changed files with 17 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mail/courier-authlib/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.48 2014/09/15 15:18:16 naddy Exp $
# $OpenBSD: Makefile,v 1.49 2014/10/28 09:19:29 giovanni Exp $
COMMENT-main= authentication library for courier
COMMENT-ldap= ldap authentication module for courier-authLib
@ -7,15 +7,14 @@ COMMENT-pgsql= pgsql authentication module for courier-authLib
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 -pgsql -userdb
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

13
mail/courier-authlib/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.4 2014/04/11 09:35:04 giovanni Exp $
$OpenBSD: patch-Makefile_in,v 1.5 2014/10/28 09:19:29 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/04/11 09:35:04 giovanni Exp $
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@

12
mail/courier-authlib/patches/patch-authldap_h
View File

@ -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 <luc.saillard@alcove.fr>. */
#if HAVE_CONFIG_H

19
mail/courier-authlib/patches/patch-authldaplib_c
View File

@ -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"