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

update to 0.69 and fix dependencies only needed for regression tests

Browse Source 
hints and ok sthen@ jca@
This commit is contained in:
giovanni 2019-07-08 09:46:54 +00:00
parent 1e75b9f645
commit fd3d09b271
9 changed files with 24 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mail/courier-authlib/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.76 2019/05/20 22:15:15 naddy Exp $
# $OpenBSD: Makefile,v 1.77 2019/07/08 09:46:54 giovanni Exp $
COMMENT-main= authentication library for courier
COMMENT-ldap= ldap authentication module for courier-authLib
@ -6,9 +6,7 @@ COMMENT-mysql= mysql authentication module for courier-authLib
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

4
mail/courier-authlib/distinfo
View File

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

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

@ -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
$OpenBSD: patch-Makefile_in,v 1.8 2019/07/08 09:46:54 giovanni Exp $
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/02/10 09:40:01 giovanni Exp $
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

42
mail/courier-authlib/patches/patch-libs_rfc822_configure_ac
View File

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

3
mail/courier-authlib/pkg/PLIST-ldap
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-ldap,v 1.3 2016/03/23 12:12:26 naddy Exp $
@comment $OpenBSD: PLIST-ldap,v 1.4 2019/07/08 09:46:54 giovanni Exp $
@comment lib/libauthldap.a
@comment lib/libauthldap.la
@lib lib/libauthldap.so.${LIBauthldap_VERSION}
@ -7,4 +7,3 @@ share/examples/courier-authlib/authldap.schema
share/examples/courier-authlib/authldaprc.dist
@mode 600
@sample ${SYSCONFDIR}/courier/authldaprc
@mode

7
mail/courier-authlib/pkg/PLIST-main
View File

@ -1,8 +1,10 @@
@comment $OpenBSD: PLIST-main,v 1.9 2016/03/23 12:12:26 naddy Exp $
@comment $OpenBSD: PLIST-main,v 1.10 2019/07/08 09:46:54 giovanni Exp $
@conflict courier-authlib-*
@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/authdaemonrc.dist
share/examples/courier-authlib/authsqliterc.dist
@mode 600
@sample ${SYSCONFDIR}/courier/authsqliterc
@mode
@rcscript ${RCDIR}/courier_authdaemond

3
mail/courier-authlib/pkg/PLIST-mysql
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-mysql,v 1.3 2016/03/23 12:12:26 naddy Exp $
@comment $OpenBSD: PLIST-mysql,v 1.4 2019/07/08 09:46:54 giovanni Exp $
@comment lib/libauthmysql.a
@comment lib/libauthmysql.la
@lib lib/libauthmysql.so.${LIBauthmysql_VERSION}
@ -6,4 +6,3 @@ share/doc/courier-authlib/README.authmysql.myownquery
share/examples/courier-authlib/authmysqlrc.dist
@mode 600
@sample ${SYSCONFDIR}/courier/authmysqlrc
@mode

3
mail/courier-authlib/pkg/PLIST-pgsql
View File

@ -1,8 +1,7 @@
@comment $OpenBSD: PLIST-pgsql,v 1.3 2016/03/23 12:12:26 naddy Exp $
@comment $OpenBSD: PLIST-pgsql,v 1.4 2019/07/08 09:46:54 giovanni Exp $
@comment lib/libauthpgsql.a
@comment lib/libauthpgsql.la
@lib lib/libauthpgsql.so.${LIBauthpgsql_VERSION}
share/examples/courier-authlib/authpgsqlrc.dist
@mode 600
@sample ${SYSCONFDIR}/courier/authpgsqlrc
@mode

6
mail/courier-authlib/pkg/PLIST-userdb
View File

@ -1,14 +1,14 @@
@comment $OpenBSD: PLIST-userdb,v 1.5 2016/03/23 12:12:26 naddy Exp $
@comment $OpenBSD: PLIST-userdb,v 1.6 2019/07/08 09:46:54 giovanni Exp $
@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