[Kolab-devel] server/imapd kolab.patch,1.5.2.3,1.5.2.4 by tassilo at doto.intevation.de

[root at intevation.de]

Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv10881

Modified Files:
      Tag: KOLAB_1_0
	kolab.patch 
Log Message:
some openpkg fixes
they included stuff from us, but not exactly as we did it ;-)



Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -d -r1.5.2.3 -r1.5.2.4
--- kolab.patch	9 Jun 2003 12:18:18 -0000	1.5.2.3
+++ kolab.patch	7 Jul 2003 18:32:50 -0000	1.5.2.4
@@ -93,17 +93,17 @@
 +     return newstate;
 + }
 + 
---- imapd.spec.orig	2003-05-30 21:42:25.000000000 +0200
-+++ imapd.spec	2003-06-06 18:04:24.000000000 +0200
-@@ -37,6 +37,7 @@
- 
+--- imapd.spec.orig	2003-07-07 14:10:54.000000000 +0200
++++ imapd.spec	2003-07-07 20:14:02.000000000 +0200
+@@ -38,6 +38,7 @@
  #   package options
+ %option       with_fsl         yes
  %option       with_vhost_hack  no
 +%option       with_groupfile_hack no
  
  #   list of sources
  Source0:      ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -46,6 +47,7 @@
+@@ -47,6 +48,7 @@
  Source4:      fsl.imapd
  Patch0:       imapd.patch
  Patch1:       vhosthack.patch
@@ -111,7 +111,7 @@
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -66,7 +68,9 @@
+@@ -73,7 +75,9 @@
  
  %prep
      %setup -q -n cyrus-imapd-%{version}
@@ -122,48 +122,20 @@
      %{l_shtool} subst \
          -e 's;db-4.1;db;g' \
          configure
-@@ -141,6 +145,13 @@
-     #   redirect the hard-coded file paths
-     %{l_shtool} subst -e "s;/etc/\(.*\).conf;%{l_prefix}/etc/imapd/\\1.conf;" \
-         imap/*.c imap/*.h master/*.c master/*.h
-+    %{l_shtool} subst -e "s;/etc/mail/cyrusmap\.db;%{l_prefix}/var/imapd/cyrusmap\.db;" \
-+	imap/sendmail-map.c
-+%if "%{with_groupfile_hack}" == "yes"
-+    %{l_shtool} subst -e "s;/etc/imapd.group;%{l_prefix}/halole/etc/imapd/imapd.group;" \
-+        lib/auth_unix.c	
-+%endif
+@@ -152,6 +156,11 @@
+     %{l_shtool} subst \
+         -e 's;/etc/mail/cyrusmap\.db;%{l_prefix}/var/imapd/cyrusmap.db;' \
+         imap/sendmail-map.c
++    %if "%{with_groupfile_hack}" == "yes"
++      %{l_shtool} subst -e "s;/etc/imapd.group;%{l_prefix}/halole/etc/imapd/imapd.group;" \
++         lib/auth_unix.c
++    %endif
 +
      %{l_make} %{l_mflags}
  
-     #   build (and install) Perl-based administration stuff
-@@ -149,8 +160,23 @@
-       export SASL_INC="%{l_cppflags}"
-       export SASL_LIB="%{l_ldflags} -lsasl2"
-       export OPENSSL_INC="%{l_cppflags}"
--      export OPENSSL_LIB="%{l_ldflags} -lssl -lcrypto"
--      %{l_prefix}/bin/perl-openpkg install )
-+      export OPENSSL_LIB="%{l_ldflags} -lssl -lcrypto" )
-+   
-+    ( cd perl/sieve && make )
-+
-+    %{l_prefix}/bin/perl-openpkg prolog
-+    ( cd perl/sieve/managesieve
-+      export SASL_INC="%{l_cppflags}"
-+      export SASL_LIB="%{l_ldflags} -lsasl2"
-+      export OPENSSL_INC="%{l_cppflags}"
-+      export OPENSSL_LIB="%{l_ldflags} -lssl -lcrypto" )
-+
-+    %{l_prefix}/bin/perl-openpkg prolog
-+    ( cd perl/sieve/acap
-+      export SASL_INC="%{l_cppflags}"
-+      export SASL_LIB="%{l_ldflags} -lsasl2"
-+      export OPENSSL_INC="%{l_cppflags}"
-+      export OPENSSL_LIB="%{l_ldflags} -lssl -lcrypto" ) 
- 
  %install
- #   FIXME: clean up disabled due to 'perl-openpkg install'
-@@ -165,6 +191,13 @@
-         $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
+@@ -182,6 +191,13 @@
+         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
          $RPM_BUILD_ROOT%{l_prefix}/var/imapd/spool \
          $RPM_BUILD_ROOT%{l_prefix}/bin
 +    %{l_shtool} install -c -m 755 \
@@ -174,5 +146,5 @@
 +    ( cd perl/sieve/managesieve && %{l_prefix}/bin/perl-openpkg install )
 +    ( cd perl/sieve/acap && %{l_prefix}/bin/perl-openpkg install )
  
-     #   offer a sane configuration
- 
+     #   install sieve adminstration script
+     %{l_shtool} install -c -m 755 \