diff --git a/AIX/php5/php5.spec b/AIX/php5/php5.spec index 68b344d..65bdddc 100644 --- a/AIX/php5/php5.spec +++ b/AIX/php5/php5.spec @@ -70,13 +70,20 @@ cp php.ini-recommended %{buildroot}/%{_sysconfdir} %preun rm /usr/IBM/HTTPServer/conf/php.ini -cp /usr/IBM/HTTPServer/conf/httpd.conf.bak /usr/IBM/HTTPServer/conf/http.conf +mv /usr/IBM/HTTPServer/conf/httpd.conf.bak /usr/IBM/HTTPServer/conf/http.conf /usr/IBM/HTTPServer/bin/apachectl stop %postun /usr/IBM/HTTPServer/bin/apachectl start %post + +if [ "$1" = 2 ] #update to the newer rpm package + echo "updating to the newer rpm..." + mv /usr/IBM/HTTPServer/conf/httpd.conf.bak /usr/IBM/HTTPServer/conf/httpd.conf +fi + + cp %{_sysconfdir}/php.ini-recommended /usr/IBM/HTTPServer/conf/php.ini cp /usr/IBM/HTTPServer/conf/httpd.conf /usr/IBM/HTTPServer/conf/httpd.conf.bak diff --git a/conserver/conserver.spec b/conserver/conserver.spec index 387f241..751c646 100644 --- a/conserver/conserver.spec +++ b/conserver/conserver.spec @@ -23,6 +23,7 @@ URL: http://www.conserver.com/ Source: http://www.conserver.com/%{pkg}-%{ver}.tar.gz Patch: certificate-auth.patch Patch1: initscript.patch +Patch2: initscript1.patch BuildRoot: %{_tmppath}/%{pkg}-buildroot BuildRequires: openssl-devel Prefix: %{_prefix} @@ -40,6 +41,7 @@ bells and whistles to accentuate that basic functionality. %setup -q %patch -p1 %patch1 -p1 +%patch2 -p1 %build diff --git a/conserver/initscript1.patch b/conserver/initscript1.patch new file mode 100644 index 0000000..a1c30e7 --- /dev/null +++ b/conserver/initscript1.patch @@ -0,0 +1,19 @@ +--- conserver-8.1.16/contrib/redhat-rpm/conserver.init 2009-10-12 05:06:44.000000000 -0400 ++++ conserver-8.1.16/contrib/redhat-rpm/conserver.init.new 2009-10-12 05:08:29.000000000 -0400 +@@ -6,6 +6,16 @@ + # description: conserver is a serial-port console daemon + # config: /etc/conserver.cf + # ++### BEGIN INIT INFO ++# Provides: conserver ++# Required-Start: ++# Required-Stop: ++# Default-Start: 2 3 4 5 ++# Default-stop: ++# Short-Description: conserver ++# Description: Console server ++### END INIT INFO ++ + RHPassed() + { + passed diff --git a/stunnel/initscript.patch b/stunnel/initscript.patch new file mode 100644 index 0000000..91d8c01 --- /dev/null +++ b/stunnel/initscript.patch @@ -0,0 +1,18 @@ +--- stunnel-4.26/tools/stunnel.init.in 2008-09-17 14:53:46.000000000 -0400 ++++ stunnel-4.26/tools/stunnel.init.in.new 2009-10-12 05:25:55.000000000 -0400 +@@ -1,6 +1,15 @@ + #!/bin/sh + # Sample stunnel SysV startup file + # Copyright by Michal Trojnara 2002,2007,2008 ++### BEGIN INIT INFO ++# Provides: stunnel ++# Required-Start: ++# Required-Stop: ++# Default-Start: 3 4 5 ++# Default-stop: 0 1 2 6 ++# Short-Description: stunnel ++# Description: stunnel deamon ++### END INIT INFO + + PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin + DAEMON=@prefix@/bin/stunnel diff --git a/stunnel/stunnel.spec b/stunnel/stunnel.spec index d395dc7..dc994e9 100644 --- a/stunnel/stunnel.spec +++ b/stunnel/stunnel.spec @@ -8,6 +8,7 @@ Release: 1 License: GPL Group: Applications/Networking Source: stunnel-%{version}.tar.gz +Patch: initscript.patch Packager: neeo Requires: openssl >= 0.9.6g BuildRequires: openssl-devel >= 0.9.6g @@ -26,6 +27,7 @@ changes to the source code. %prep %setup -n stunnel-%{version} +%patch -p1 %build