Package: masqmail Version: 0.2.20-1 Tags: upstream Attached is a patch to port masqmail to use GLib 2 instead of the unmaintained Glib 1.
Ross
--
Ross Burton mail: [EMAIL PROTECTED]
jabber: [EMAIL PROTECTED]
www: http://www.burtonini.com./
PGP Fingerprint: 1A21 F5B0 D8D0 CFE3 81D4 E25A 2D09 E447 D0B4 33DF
diff -ru masqmail-0.2.20/configure.ac masqmail-glib2-0.2.20/configure.ac
--- masqmail-0.2.20/configure.ac 2003-06-03 16:52:45.000000000 +0100
+++ masqmail-glib2-0.2.20/configure.ac 2004-06-17 17:23:39.000000000 +0100
@@ -20,7 +20,9 @@
dnl AC_ARG_PROGRAM
AC_PROG_RANLIB
-AM_PATH_GLIB
+PKG_CHECK_MODULES(GLIB, glib-2.0)
+AC_SUBST(GLIB_LIBS)
+AC_SUBST(GLIB_CFLAGS)
dnl resolver support (default is use it)
AC_ARG_ENABLE(resolver,
@@ -32,7 +34,7 @@
)
if test "$resolver_enabled" = yes; then
- AC_DEFINE(ENABLE_RESOLVER, 1)
+ AC_DEFINE(ENABLE_RESOLVER, 1, [If the resolver is to be used])
dnl checks necessary for libc5:
dnl if there is res_search in libc, it is probably libc5
dnl if not, it is probably libc6 and we need libresolv
@@ -96,12 +98,12 @@
debug_enabled='yes'
)
if test "x$debug_enabled" = xyes; then
- AC_DEFINE(ENABLE_DEBUG, 1)
+ AC_DEFINE(ENABLE_DEBUG, 1, [If debugging is enabled])
fi
-AC_DEFINE_UNQUOTED(DEF_MAIL_USER, "${with_user}")
+AC_DEFINE_UNQUOTED(DEF_MAIL_USER, "${with_user}", [The mail user])
AC_SUBST(with_user)
-AC_DEFINE_UNQUOTED(DEF_MAIL_GROUP, "${with_group}")
+AC_DEFINE_UNQUOTED(DEF_MAIL_GROUP, "${with_group}", [The mail group])
AC_SUBST(with_group)
dnl link glib statically?
@@ -126,7 +128,7 @@
smtp_server_enabled='yes'
)
if test "x$smtp_server_enabled" = xyes; then
- AC_DEFINE(ENABLE_SMTP_SERVER, 1)
+ AC_DEFINE(ENABLE_SMTP_SERVER, 1, [If the SMTP server is enabled])
fi
dnl pop support (default is use it)
@@ -138,7 +140,7 @@
pop3_enabled='yes'
)
if test "x$pop3_enabled" = xyes; then
- AC_DEFINE(ENABLE_POP3, 1)
+ AC_DEFINE(ENABLE_POP3, 1, [If the POP3 support is enabled])
# MD5_LIBS='md5/libmd5c.a'
need_md5='yes'
fi
@@ -151,7 +153,7 @@
fi,
)
if test "x$auth_enabled" = xyes; then
- AC_DEFINE(ENABLE_AUTH, 1)
+ AC_DEFINE(ENABLE_AUTH, 1, [If AUTH is enabled])
BASE64_LIBS='base64/libbase64.a'
# MD5_LIBS='md5/libmd5c.a'
need_md5='yes'
@@ -166,7 +168,7 @@
fi,
)
if test "x$maildir_enabled" = xyes; then
- AC_DEFINE(ENABLE_MAILDIR, 1)
+ AC_DEFINE(ENABLE_MAILDIR, 1, [If Maildirs are enabled])
fi
dnl libcrypto
@@ -182,7 +184,7 @@
if test "x$with_libcrypto" = "xyes"; then
AC_CHECK_LIB(crypto, MD5, has_crypto='yes', AC_MSG_ERROR('no libcrypto'))
if test "x$has_crypto" = 'xyes'; then
- AC_DEFINE(USE_LIB_CRYPTO, 1)
+ AC_DEFINE(USE_LIB_CRYPTO, 1, [If libcrypto is available])
MD5_LIBS='-lcrypto'
fi
else
@@ -201,7 +203,7 @@
)
AC_SUBST(has_ident)
if test "x$ident_enabled" = xyes; then
- AC_DEFINE(ENABLE_IDENT, 1)
+ AC_DEFINE(ENABLE_IDENT, 1, [If ident is enabled])
AC_CHECK_LIB(ident, ident_id, IDENT_LIBS='-lident', IDENT_LIBS='libident/libident.a')
fi
AC_SUBST(IDENT_LIBS)
@@ -214,7 +216,7 @@
fi,
)
if test "x$mserver_enabled" = xyes; then
- AC_DEFINE(ENABLE_MSERVER, 1)
+ AC_DEFINE(ENABLE_MSERVER, 1, [If mserver support is enabled])
fi
dnl liblockfile
@@ -227,7 +229,7 @@
if test "x$with_liblockfile" = xyes; then
AC_CHECK_LIB(lockfile, maillock, has_lockfile=yes, AC_MSG_ERROR("no liblockfile"))
LOCKFILE_LIBS='-llockfile'
- AC_DEFINE(USE_LIBLOCKFILE, 1)
+ AC_DEFINE(USE_LIBLOCKFILE, 1, [If liblockfile is to be used])
else
LOCKFILE_LIBS=''
fi
@@ -255,17 +257,17 @@
,
with_confdir='/etc/masqmail'
)
-AC_DEFINE_UNQUOTED(CONF_DIR, "${with_confdir}")
+AC_DEFINE_UNQUOTED(CONF_DIR, "${with_confdir}", [The configuration file location])
AC_SUBST(with_confdir)
dnl well, /me/ thought that autoconf should make things _easy_ ...
test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-AC_DEFINE_UNQUOTED(DATA_DIR, "`eval echo \""$datadir"\"`/masqmail")
+AC_DEFINE_UNQUOTED(DATA_DIR, "`eval echo \""$datadir"\"`/masqmail", [The data directory])
dnl gymnastics to get the correct path where masqmail should be installed
dnl we need this to call ourselves in failmsg.c
if test "x${exec_prefix}" != 'xNONE'; then
- AC_DEFINE_UNQUOTED(SBINDIR, "${exec_prefix}/sbin")
+ AC_DEFINE_UNQUOTED(SBINDIR, "${exec_prefix}/sbin", [The sbin directory])
else
if test "x${prefix}" != 'xNONE'; then
AC_DEFINE_UNQUOTED(SBINDIR, "${prefix}/sbin")
diff -ru masqmail-0.2.20/src/Makefile.am masqmail-glib2-0.2.20/src/Makefile.am
--- masqmail-0.2.20/src/Makefile.am 2002-11-13 14:44:12.000000000 +0000
+++ masqmail-glib2-0.2.20/src/Makefile.am 2004-06-17 17:26:35.000000000 +0100
@@ -1,6 +1,6 @@
SUBDIRS=base64 md5 libident
[EMAIL PROTECTED]@ @GLIB_CFLAGS@ -D_GNU_SOURCE
[EMAIL PROTECTED]@ @GLIB_CFLAGS@ -D_GNU_SOURCE -DG_DISABLE_DEPRECATED
sbin_PROGRAMS=masqmail
bin_PROGRAMS=mservdetect
signature.asc
Description: This is a digitally signed message part
