rpms/up-imapproxy/F-9 import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 imapproxy.init, 1.1, 1.2 sources, 1.3, 1.4 up-imapproxy.spec, 1.10, 1.11 up-imapproxy-CAN-2005-2661.patch, 1.1, NONE up-imapproxy-openssl098a.patch, 1.1, NONE

[Rakesh Pandit]

Author: rakesh

Update of /cvs/pkgs/rpms/up-imapproxy/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10060/F-9

Modified Files:
	.cvsignore imapproxy.init sources up-imapproxy.spec 
Added Files:
	import.log 
Removed Files:
	up-imapproxy-CAN-2005-2661.patch 
	up-imapproxy-openssl098a.patch 
Log Message:
updated to 1.2.6, removed old patches (already fixed upstream)
fixed initscript wrt guidelines



--- NEW FILE import.log ---
up-imapproxy-1_2_6-2_fc9:F-9:up-imapproxy-1.2.6-2.fc9.src.rpm:1220191059


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/up-imapproxy/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2005 02:20:07 -0000	1.3
+++ .cvsignore	31 Aug 2008 14:10:36 -0000	1.4
@@ -1 +1 @@
-up-imapproxy-1.2.4.tar.gz
+up-imapproxy-1.2.6.tar.gz


Index: imapproxy.init
===================================================================
RCS file: /cvs/pkgs/rpms/up-imapproxy/F-9/imapproxy.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imapproxy.init	9 Sep 2005 12:50:22 -0000	1.1
+++ imapproxy.init	31 Aug 2008 14:10:36 -0000	1.2
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# up-imapproxy: Starts the University of Pittsburgh IMAP Proxy
+# imapproxy: Starts the University of Pittsburgh IMAP Proxy
 #
 # chkconfig: - 75 25
 # description: imapproxy was written to compensate for webmail clients that \
@@ -20,26 +20,30 @@
 
 . /etc/sysconfig/network
 
+exec="/usr/sbin/in.imapproxyd"
+prog="imapproxy"
+
 # Check that networking is configured.
 [ ${NETWORKING} = "no" ] && exit 0
 
+RETVAL=0
+lockfile=/var/lock/subsys/$prog
+
 start() {
-	echo -n $"Starting imapproxyd: "
-	daemon /usr/sbin/in.imapproxyd
+	[ -x $exec ] || exit 5
+	echo -n $"Starting up-imapproxy daemon: "
 	RETVAL=$?
 	echo
-	touch $lockfile
+	[ $RETVAL -eq 0 ] && touch $lockfile
 	return $RETVAL
 }
 
 stop() {
-	echo -n $"Shutting down imapproxyd: "
+	echo -n $"Shutting down up-imapproxy daemon: "
 	killproc /usr/sbin/in.imapproxyd
 	RETVAL=$?
-	if [ $RETVAL -eq 0 ] ; then
-	    rm -f $lockfile
-	fi
 	echo
+	[ $RETVAL -eq 0 ] &&  rm -f $lockfile
 	return $RETVAL
 }
 
@@ -48,29 +52,53 @@
 	start
 }
 
-RETVAL=0
-lockfile=/var/lock/subsys/imapproxy
+reload() {
+	restart
+}
+
+force_reload() {
+	restart
+}
+
+fd_status() {
+	status $prog
+}
+
+fd_status_q() {
+	fd_status >/dev/null 2>&1
+}
+
 
 # See how we were called.
 case "$1" in
   start)
-	start
+	fd_status_q && exit 0
+	$1
 	;;
   stop)
-	stop
+	fd_status_q || exit 0
+	$1
 	;;
   status)
-	status in.imapproxyd
+	fd_status
 	;;
-  restart|reload)
-	restart
+  restart)
+	$1
+	;;
+  reload)
+	fd_status_q || exit 7
+	$1
 	;;
-  condrestart)
-        [ -f /var/lock/subsys/in.imapproxyd ] && restart || :
+  force-reload)
+	force_reload
+	;;
+  condrestart|try-restart)
+	fd_status_q || exit 0
+	restart
 	;;
   *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
-	exit 1
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+	exit 2
 esac
 
 exit $?


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/up-imapproxy/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2005 02:20:07 -0000	1.3
+++ sources	31 Aug 2008 14:10:36 -0000	1.4
@@ -1 +1 @@
-ad68dd2258255ac6ef87165f518390e9  up-imapproxy-1.2.4.tar.gz
+decc6693a1497e5a1bc5704e5ed28c9b  up-imapproxy-1.2.6.tar.gz


Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/up-imapproxy/F-9/up-imapproxy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- up-imapproxy.spec	19 Feb 2008 05:56:03 -0000	1.10
+++ up-imapproxy.spec	31 Aug 2008 14:10:36 -0000	1.11
@@ -1,21 +1,18 @@
-Summary: University of Pittsburgh IMAP Proxy
-Name: up-imapproxy
-Version: 1.2.4
-Release: 9%{?dist}
-License: GPL
-Group: System Environment/Daemons
-URL: http://www.imapproxy.org
-Source0: http://www.imapproxy.org/downloads/up-imapproxy-%{version}.tar.gz
-Source1: imapproxy.init
-# Source1 can be downloaded from
-# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=118632
-Patch0: %{name}-CAN-2005-2661.patch
-Patch1: %{name}-openssl098a.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:           up-imapproxy
+Summary:        University of Pittsburgh IMAP Proxy
+Version:        1.2.6
+Release:        2%{?dist}
+License:        GPLv2+
+Group:          System Environment/Daemons
+URL:            http://www.imapproxy.org
+Source0:        http://www.imapproxy.org/downloads/up-imapproxy-%{version}.tar.gz
+Source1:        imapproxy.init
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  openssl-devel tcp_wrappers ncurses-devel
+
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/service
-BuildRequires: openssl-devel tcp_wrappers ncurses-devel
 
 %description
 imapproxy was written to compensate for webmail clients that are
@@ -30,8 +27,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
 
 %build
 %configure
@@ -41,14 +36,20 @@
 rm -rf $RPM_BUILD_ROOT
 # The install-* Makefile targets don't support DESTDIR syntax, so work around.
 install -D -m 0644 -p scripts/imapproxy.conf \
-	$RPM_BUILD_ROOT%{_sysconfdir}/imapproxy.conf
+    $RPM_BUILD_ROOT%{_sysconfdir}/imapproxy.conf
 install -D -m 0755 -p %{SOURCE1} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/imapproxy
+    $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/imapproxy
 install -d -m 0755 $RPM_BUILD_ROOT%{_sbindir}
 install -m 0755 bin/* $RPM_BUILD_ROOT%{_sbindir}
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run
 touch $RPM_BUILD_ROOT%{_localstatedir}/run/pimpstats
 
+# Fix doc permissions
+chmod 644 README* COPYING copyright ChangeLog
+
+# Fix debuginfo package file permission
+chmod 644 include/imapproxy.h src/main.c
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,7 +69,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog README README.debian README.known_issues README.ssl
+%doc COPYING ChangeLog README README.ssl
 %doc copyright
 %config(noreplace) %{_sysconfdir}/imapproxy.conf
 %ghost %{_localstatedir}/run/pimpstats
@@ -76,6 +77,14 @@
 %{_sbindir}/*
 
 %changelog
+* Thu Aug 28 2008 Rakesh Pandit <rakesh at fedoraproect.org> 1.2.6-2
+- fixed initscript to follow guidelines
+
+* Thu Aug 28 2008 Rakesh Pandit <rakesh at fedoraproect.org> 1.2.6-1
+- Update to 1.2.6
+- Remove old patches (already upstream), Remove README.known_issues
+- Tidy init script (Tim Jackson)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.4-9
 - Autorebuild for GCC 4.3
 
@@ -126,4 +135,3 @@
 
 * Mon Jul 18 2005 Jeff Carlson <jeff at ultimateevil.org> - 1.2.3-1
 - Initial build.
-


--- up-imapproxy-CAN-2005-2661.patch DELETED ---


--- up-imapproxy-openssl098a.patch DELETED ---