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

unbreak and regen patches

Browse Source 
spotted by Nygel Tailor, thanks
This commit is contained in:
giovanni 2017-02-10 09:40:01 +00:00
parent 4f4ba634d7
commit 81e1a887f2
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.6 2016/05/27 16:18:28 giovanni Exp $
--- Makefile.in.orig Sat Nov 14 22:45:09 2015
+++ Makefile.in Thu May 12 17:25:53 2016
@@ -667,7 +667,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h authsqliterc.h
$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
@@ -688,7 +688,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h authsqliterc.h
DISTCLEANFILES = dbobj.config README_authlib.html
commonlibdep = libcourierauthcommon.la
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2016/05/27 16:18:28 giovanni Exp $
commonlibadd = libcourierauthcommon.la
libcourierauthcommon_t = @CRYPTLIBS@
libcourierauthcommon_la_SOURCES = \
@@ -684,7 +684,7 @@ libcourierauthcommon_la_SOURCES = \
@@ -706,7 +706,7 @@ libcourierauthcommon_la_SOURCES = \
libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
libcourierauthcommon_la_LIBADD = libcourierauth.la
@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2016/05/27 16:18:28 giovanni Exp $
libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
authmoduser2.c authmoduser3.c debug.c \
courierauthdebug.h \
@@ -693,7 +693,7 @@ libcourierauth_la_SOURCES = authdaemon.c authdaemonlib
@@ -715,7 +715,7 @@ libcourierauth_la_SOURCES = authdaemon.c authdaemonlib
libcourierauth_la_LIBADD = libs/libhmac/libhmac.la libs/md5/libmd5.la libs/sha1/libsha1.la libs/numlib/libnumlib.la \
libs/random128/librandom128.la libs/rfc822/libencode.la
@ -28,7 +28,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2016/05/27 16:18:28 giovanni Exp $
# The userdb module
libauthuserdb_t = userdb/libuserdb.la @dblibrary@ @LIBGDBM@ @LIBDB@
@@ -794,7 +794,7 @@ libcourierauthsasl_la_SOURCES = \
@@ -817,7 +817,7 @@ libcourierauthsasl_la_SOURCES = \
authsaslfrombase64.c authsasltobase64.c
libcourierauthsasl_la_LIBADD = libcourierauthcommon.la libcourierauth.la
@ -37,7 +37,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2016/05/27 16:18:28 giovanni Exp $
libcourierauthsaslclient_la_SOURCES = courierauthsaslclient.h \
authsaslclient.c authsaslclient.h authsaslclientcram.c \
authsaslclientcrammd5.c authsaslclientcramsha1.c \
@@ -803,7 +803,7 @@ libcourierauthsaslclient_la_SOURCES = courierauthsaslc
@@ -826,7 +826,7 @@ libcourierauthsaslclient_la_SOURCES = courierauthsaslc
authsaslfrombase64.c authsasltobase64.c
libcourierauthsaslclient_la_LIBADD = libcourierauth.la
@ -46,7 +46,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2016/05/27 16:18:28 giovanni Exp $
include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h
@@ -836,7 +836,7 @@ authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommo
@@ -859,7 +859,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

18
mail/courier-authlib/patches/patch-configure
View File

@ -1,7 +1,15 @@
$OpenBSD: patch-configure,v 1.6 2016/05/27 16:18:28 giovanni Exp $
--- configure.orig Sat Nov 14 22:45:08 2015
+++ configure Thu May 12 17:25:53 2016
@@ -15791,7 +15791,7 @@ then
$OpenBSD: patch-configure,v 1.7 2017/02/10 09:40:01 giovanni Exp $
--- configure.orig Wed Jan 18 03:18:46 2017
+++ configure Fri Feb 10 10:31:16 2017
@@ -18878,6 +18878,7 @@ fi
LIBS="$saveLIBS"
HAVE_AUTHPGSQL=1
CFLAGS="$PGSQL_CFLAGS $CFLAGS"
+ CPPFLAGS="$PGSQL_CFLAGS $CPPFLAGS"
LIBAUTHPGSQL="libauthpgsql.la"
fi
@@ -19641,7 +19642,7 @@ then
$COURIERCONFIG >conftest.out || exit 1
sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1
. ./conftest2.out
@ -10,7 +18,7 @@ $OpenBSD: patch-configure,v 1.6 2016/05/27 16:18:28 giovanni Exp $
cmailuser="$mailuser"
cmailgroup="$mailgroup"
@@ -15803,7 +15803,7 @@ then
@@ -19653,7 +19654,7 @@ then
$bindir/courierauthconfig --configfiles >conftest.out || exit 1
sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1
. ./conftest2.out