[gentoo-commits] gentoo-x86 commit in net-mail/vmailmgr/files: vmailmgr-0.97-gentoo.patch vmailmgr-0.97-no-authvmailmgr.patch

[Alin Nastac (mrness)]

mrness      08/06/22 22:18:06

  Modified:             vmailmgr-0.97-gentoo.patch
  Removed:              vmailmgr-0.97-no-authvmailmgr.patch
  Log:
  Sanitize patches (#226797).
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.2                  net-mail/vmailmgr/files/vmailmgr-0.97-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/vmailmgr/files/vmailmgr-0.97-gentoo.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/vmailmgr/files/vmailmgr-0.97-gentoo.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/vmailmgr/files/vmailmgr-0.97-gentoo.patch?r1=1.1&r2=1.2

Index: vmailmgr-0.97-gentoo.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/files/vmailmgr-0.97-gentoo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vmailmgr-0.97-gentoo.patch	26 Dec 2005 11:03:08 -0000	1.1
+++ vmailmgr-0.97-gentoo.patch	22 Jun 2008 22:18:05 -0000	1.2
@@ -1,44 +1,63 @@
 diff -Nru vmailmgr-0.97.orig/authenticate/Makefile.am vmailmgr-0.97/authenticate/Makefile.am
---- vmailmgr-0.97.orig/authenticate/Makefile.am	2003-12-02 05:46:43.000000000 +0200
-+++ vmailmgr-0.97/authenticate/Makefile.am	2005-12-25 10:41:07.000000000 +0200
-@@ -1,6 +1,6 @@
+--- vmailmgr-0.97.orig/authenticate/Makefile.am	2008-06-23 00:06:53.000000000 +0200
++++ vmailmgr-0.97/authenticate/Makefile.am	2008-06-23 00:04:28.000000000 +0200
+@@ -1,6 +1,4 @@
  bin_PROGRAMS = checkvpw vauthenticate
- authlib_PROGRAMS = authvmailmgr
+-authlib_PROGRAMS = authvmailmgr
 -authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
-+authlibdir = ${libdir}/courier-imap/authlib/
  
  noinst_PODS = checkvpw.pod vauthenticate.pod
  noinst_HTMLS = $(noinst_PODS:.pod=.html)
-diff -Nru vmailmgr-0.97.orig/authenticate/Makefile.in vmailmgr-0.97/authenticate/Makefile.in
---- vmailmgr-0.97.orig/authenticate/Makefile.in	2005-09-04 08:01:56.000000000 +0300
-+++ vmailmgr-0.97/authenticate/Makefile.in	2005-12-25 10:41:07.000000000 +0200
-@@ -85,7 +85,7 @@
- 
- bin_PROGRAMS = checkvpw vauthenticate
- authlib_PROGRAMS = authvmailmgr
--authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
-+authlibdir = ${libdir}/courier-imap/authlib/
- 
- noinst_PODS = checkvpw.pod vauthenticate.pod
- noinst_HTMLS = $(noinst_PODS:.pod=.html)
-diff -Nru vmailmgr-0.97.orig/configure vmailmgr-0.97/configure
---- vmailmgr-0.97.orig/configure	2005-09-04 07:26:50.000000000 +0300
-+++ vmailmgr-0.97/configure	2005-12-25 10:41:07.000000000 +0200
-@@ -3431,7 +3431,7 @@
-   WANTPYTHON_FALSE=
- fi
+@@ -25,8 +23,5 @@
+ checkvpw_SOURCES = checkvpw.cc authvlib.cc authvlib.h
+ checkvpw_LDADD = ../lib/libvmailmgr.a
+ 
+-authvmailmgr_SOURCES = authvmailmgr.cc authvlib.cc authvlib.h
+-authvmailmgr_LDADD = ../lib/libvmailmgr.a -L../lib/courier-authlib -lauthmod
+-
+ vauthenticate_SOURCES = vauthenticate.cc authvlib.cc authvlib.h
+ vauthenticate_LDADD = ../lib/libvmailmgr.a
+diff -Nru vmailmgr-0.97.orig/configure.in vmailmgr-0.97/configure.in
+--- vmailmgr-0.97.orig/configure.in	2008-06-23 00:06:53.000000000 +0200
++++ vmailmgr-0.97/configure.in	2008-06-23 00:04:28.000000000 +0200
+@@ -62,7 +62,7 @@
+ AC_SUBST(pythonlibdir)
+ AM_CONDITIONAL(WANTPYTHON, test x$local_cv_python_lib_dir != xNONE)
  
 -phpdir="/home/httpd/php"
 +phpdir="${libdir}/php"
+ AC_SUBST(phpdir)
  
- 
- # Extract the first word of "w3m", so it can be a program name with args.
-@@ -5570,7 +5570,7 @@
- done
- 
+ AC_PATH_PROG(W3M, w3m)
+@@ -113,7 +113,7 @@
+ AC_CHECK_FUNCS(gethostname gettimeofday mkdir putenv rmdir socket)
+ AC_CHECK_FUNCS(srandom random crypt)
  
 -cgidir='${prefix}/cgi-bin'
 +cgidir='/var/www/localhost/cgi-bin'
+ AC_SUBST(cgidir)
  
+ AC_OUTPUT(Makefile
+diff -Nru vmailmgr-0.97.orig/lib/Makefile.am vmailmgr-0.97/lib/Makefile.am
+--- vmailmgr-0.97.orig/lib/Makefile.am	2008-06-23 00:06:53.000000000 +0200
++++ vmailmgr-0.97/lib/Makefile.am	2008-06-23 00:04:28.000000000 +0200
+@@ -1,5 +1,4 @@
+-SUBDIRS = misc vdomain vpwentry vpwtable cdb++ cgi cli++ fdbuf mystring config \
+-	courier-authlib
++SUBDIRS = misc vdomain vpwentry vpwtable cdb++ cgi cli++ fdbuf mystring config
+ noinst_LIBRARIES = libvmailmgr.a libcgi.a libcli.a
+ EXTRA_DIST = mergelib.sh
+ 
+diff -Nru vmailmgr-0.97.orig/Makefile.am vmailmgr-0.97/Makefile.am
+--- vmailmgr-0.97.orig/Makefile.am	2008-06-23 00:06:53.000000000 +0200
++++ vmailmgr-0.97/Makefile.am	2008-06-23 00:07:07.000000000 +0200
+@@ -1,7 +1,7 @@
+ if WANTPYTHON
+-SUBDIRS = python php lib authenticate commands daemon cgi doc scripts
++SUBDIRS = python php lib authenticate commands daemon cgi scripts
+ else
+-SUBDIRS = php lib authenticate commands daemon cgi doc scripts
++SUBDIRS = php lib authenticate commands daemon cgi scripts
+ endif
  
-                                                                                                                                                                                                                   ac_config_files="$ac_config_files Makefile cgi/Makefile authenticate/Makefile commands/Makefile daemon/Makefile doc/Makefile lib/Makefile lib/cdb++/Makefile lib/cgi/Makefile lib/cli++/Makefile lib/config/Makefile lib/courier-authlib/Makefile lib/fdbuf/Makefile lib/misc/Makefile lib/mystring/Makefile lib/vdomain/Makefile lib/vpwentry/Makefile lib/vpwtable/Makefile scripts/Makefile php/Makefile python/Makefile"
+ dist-hook:



-- 
gentoo-commits@l.g.o mailing list