- remove 6 out of the 10 flavors maze, only keep the ones that make sense (ie clamav, ldap, domainscale & largescale) - build pgsql & mysql drivers as subpackages, as $DEITY intended - @pkgpath & PFRAG.[flavor]-main tweaks from sthen@ (thanks!) - remove init_pwent_cache() patch until i can make some sense of it - remove painful strlcpy patches - add patches to fix pgsql support with PSQL > 9.1 from http://sourceforge.net/p/dspam/bug-tracker/112/ & http://sourceforge.net/p/dspam/bug-tracker/141 - add an rc script running dspam --daemon as _dspam - patch default dspam.conf to trust user _dspam (pointed out by jca@; thanks!) and to use port 2424 by default. Taken from debian. Discussed at length with todd@ (MAINTAINER), been running on amd64 with pgsql &| sqlite backend since a while, also tested on sqlite/ppc. Some tweaks might still be needed (a README ? Fix some weird crashers ?), but at least it's better than what we had for the past years.
64 lines
3.3 KiB
Plaintext
64 lines
3.3 KiB
Plaintext
$OpenBSD: patch-src_Makefile_in,v 1.4 2013/09/14 17:12:11 landry Exp $
|
|
Remove version-info from drivers
|
|
dont install-exec-hook for var/dspam/{,log} & etc/dspam.conf
|
|
--- src/Makefile.in.orig Mon Apr 23 19:53:45 2012
|
|
+++ src/Makefile.in Tue Jan 8 22:21:26 2013
|
|
@@ -470,8 +470,7 @@ libdspam_la_LDFLAGS = -rpath '$(libdir)' -version-info
|
|
@DYNAMIC_DRIVER_TRUE@libmysql_drv_la_CPPFLAGS = $(libmysql_drv_cppflags)
|
|
@DYNAMIC_DRIVER_TRUE@libmysql_drv_la_LDFLAGS = \
|
|
@DYNAMIC_DRIVER_TRUE@ $(libmysql_drv_ldflags) -rpath \
|
|
-@DYNAMIC_DRIVER_TRUE@ '$(pkglibdir)' -version-info \
|
|
-@DYNAMIC_DRIVER_TRUE@ $(libversion)
|
|
+@DYNAMIC_DRIVER_TRUE@ '$(pkglibdir)' -avoid-version
|
|
@DYNAMIC_DRIVER_TRUE@libmysql_drv_la_DEPENDENCIES = libdspam.la
|
|
@DYNAMIC_DRIVER_TRUE@libpgsql_drv_la_SOURCES = \
|
|
@DYNAMIC_DRIVER_TRUE@ pgsql_drv.c pgsql_drv.h
|
|
@@ -480,8 +479,7 @@ libdspam_la_LDFLAGS = -rpath '$(libdir)' -version-info
|
|
@DYNAMIC_DRIVER_TRUE@libpgsql_drv_la_CPPFLAGS = $(libpgsql_drv_cppflags)
|
|
@DYNAMIC_DRIVER_TRUE@libpgsql_drv_la_LDFLAGS = \
|
|
@DYNAMIC_DRIVER_TRUE@ $(libpgsql_drv_ldflags) -rpath \
|
|
-@DYNAMIC_DRIVER_TRUE@ '$(pkglibdir)' -version-info \
|
|
-@DYNAMIC_DRIVER_TRUE@ $(libversion)
|
|
+@DYNAMIC_DRIVER_TRUE@ '$(pkglibdir)' -avoid-version
|
|
@DYNAMIC_DRIVER_TRUE@libpgsql_drv_la_DEPENDENCIES = libdspam.la
|
|
@DYNAMIC_DRIVER_TRUE@libsqlite_drv_la_SOURCES = \
|
|
@DYNAMIC_DRIVER_TRUE@ sqlite_drv.c sqlite_drv.h
|
|
@@ -490,8 +488,7 @@ libdspam_la_LDFLAGS = -rpath '$(libdir)' -version-info
|
|
@DYNAMIC_DRIVER_TRUE@libsqlite_drv_la_CPPFLAGS = $(libsqlite_drv_cppflags)
|
|
@DYNAMIC_DRIVER_TRUE@libsqlite_drv_la_LDFLAGS = \
|
|
@DYNAMIC_DRIVER_TRUE@ $(libsqlite_drv_ldflags) -rpath \
|
|
-@DYNAMIC_DRIVER_TRUE@ '$(pkglibdir)' -version-info \
|
|
-@DYNAMIC_DRIVER_TRUE@ $(libversion)
|
|
+@DYNAMIC_DRIVER_TRUE@ '$(pkglibdir)' -avoid-version
|
|
@DYNAMIC_DRIVER_TRUE@libsqlite_drv_la_DEPENDENCIES = libdspam.la
|
|
@DYNAMIC_DRIVER_TRUE@libsqlite3_drv_la_SOURCES = \
|
|
@DYNAMIC_DRIVER_TRUE@ sqlite3_drv.c sqlite3_drv.h
|
|
@@ -500,8 +497,7 @@ libdspam_la_LDFLAGS = -rpath '$(libdir)' -version-info
|
|
@DYNAMIC_DRIVER_TRUE@libsqlite3_drv_la_CPPFLAGS = $(libsqlite3_drv_cppflags)
|
|
@DYNAMIC_DRIVER_TRUE@libsqlite3_drv_la_LDFLAGS = \
|
|
@DYNAMIC_DRIVER_TRUE@ $(libsqlite3_drv_ldflags) -rpath \
|
|
-@DYNAMIC_DRIVER_TRUE@ '$(pkglibdir)' -version-info \
|
|
-@DYNAMIC_DRIVER_TRUE@ $(libversion)
|
|
+@DYNAMIC_DRIVER_TRUE@ '$(pkglibdir)' -avoid-version
|
|
@DYNAMIC_DRIVER_TRUE@libsqlite3_drv_la_DEPENDENCIES = libdspam.la
|
|
@DYNAMIC_DRIVER_TRUE@libhash_drv_la_SOURCES = \
|
|
@DYNAMIC_DRIVER_TRUE@ hash_drv.c hash_drv.h
|
|
@@ -509,8 +505,7 @@ libdspam_la_LDFLAGS = -rpath '$(libdir)' -version-info
|
|
@DYNAMIC_DRIVER_TRUE@libhash_drv_la_LIBADD = $(libhash_drv_libs) -L. -ldspam
|
|
@DYNAMIC_DRIVER_TRUE@libhash_drv_la_CPPFLAGS = $(libhash_drv_cppflags)
|
|
@DYNAMIC_DRIVER_TRUE@libhash_drv_la_LDFLAGS = $(libhash_drv_ldflags) \
|
|
-@DYNAMIC_DRIVER_TRUE@ -rpath '$(pkglibdir)' -version-info \
|
|
-@DYNAMIC_DRIVER_TRUE@ $(libversion)
|
|
+@DYNAMIC_DRIVER_TRUE@ -rpath '$(pkglibdir)' -avoid-version
|
|
@DYNAMIC_DRIVER_TRUE@libhash_drv_la_DEPENDENCIES = libdspam.la
|
|
dspam_SOURCES = \
|
|
config.h libdspam.h language.h \
|
|
@@ -1163,7 +1158,6 @@ install-dvi-am:
|
|
install-exec-am: install-binPROGRAMS install-libLTLIBRARIES \
|
|
install-pkglibLTLIBRARIES
|
|
@$(NORMAL_INSTALL)
|
|
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
|
|
install-html: install-html-recursive
|
|
|
|
install-html-am:
|