rpms/3proxy/devel .cvsignore, 1.2, 1.3 3proxy.init, 1.1, 1.2 3proxy.spec, 1.1, 1.2 sources, 1.2, 1.3
Pavel Alexeev
hubbitus at fedoraproject.org
Mon Nov 9 11:03:44 UTC 2009
Author: hubbitus
Update of /cvs/pkgs/rpms/3proxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17658
Modified Files:
.cvsignore 3proxy.init 3proxy.spec sources
Log Message:
- Fix BZ#533144:
- Add reload section to service file, fix stop.
- Add %%{_sysconfdir}/NetworkManager/dispatcher.d/40-%%{name} (Thanks to Pankaj Pandey)
- Include man-files.
- Add Requires: initscripts as owner directory %%{_sysconfdir}/NetworkManager/dispatcher.d/
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 27 Aug 2009 20:14:25 -0000 1.2
+++ .cvsignore 9 Nov 2009 11:03:44 -0000 1.3
@@ -1 +1 @@
-3proxy-0.6.tgz
+3proxy.init
Index: 3proxy.init
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/devel/3proxy.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 3proxy.init 27 Aug 2009 20:14:26 -0000 1.1
+++ 3proxy.init 9 Nov 2009 11:03:44 -0000 1.2
@@ -11,7 +11,6 @@
#
# processname: 3proxy
# config: /etc/3proxy.cfg
-# pidfile: /var/run/3proxy.pid
WITHOUT_RC_COMPAT=1
@@ -22,26 +21,25 @@ prog=3proxy
CONFIG=/etc/3proxy.cfg
PROXY=/usr/bin/3proxy
RETVAL=0
-PIDFILE=/var/run/3proxy.pid
LOCKFILE=/var/lock/subsys/3proxy
#LOGFILE=/var/log/3proxy.log
start() {
echo -n $"Starting $prog: "
# daemon --pidfile "${PIDFILE}" sh -c "exec \"$PROXY\" \"$CONFIG\" 2>&1 > \"$LOGFILE\" &"
- daemon --pidfile "${PIDFILE}" "$PROXY" "$CONFIG"
+ daemon "$PROXY" "$CONFIG"
RETVAL=$?
echo
- [ $RETVAL = 0 ] && touch ${LOCKFILE}
+ [ 0 -eq $RETVAL ] && touch ${LOCKFILE}
return $RETVAL
}
stop() {
echo -n $"Stopping $prog: "
- killproc -p "${PIDFILE}" -d 1 "$PROXY"
+ killproc -d 3 "$prog"
RETVAL=$?
echo
- [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
+ [ 0 -eq $RETVAL ] && rm -f ${LOCKFILE}
return $RETVAL
}
@@ -52,7 +50,7 @@ restart() {
reload(){
echo -n $"Reloading $prog: "
- killproc -p ${pidfile} $httpd -USR1
+ killproc $prog -USR1
RETVAL=$?
echo
}
@@ -75,11 +73,11 @@ case "$1" in
RETVAL=$?
;;
status)
- status -p "$PIDFILE" "$PROXY"
+ status "$PROXY"
RETVAL=$?
;;
*)
- echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+ echo $"Usage: $0 {start|stop|restart|condrestart|status|reload}"
RETVAL=1
;;
esac
Index: 3proxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/devel/3proxy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 3proxy.spec 27 Aug 2009 20:14:26 -0000 1.1
+++ 3proxy.spec 9 Nov 2009 11:03:44 -0000 1.2
@@ -1,6 +1,6 @@
Name: 3proxy
Version: 0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Tiny but very powerful proxy
Summary(ru): Маленький, но крайне мощный прокси-сервер
@@ -15,6 +15,7 @@ Source2: 3proxy.cfg
# EPEL still require it
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dos2unix
+Requires: initscripts
%description
3proxy -- light proxy server.
@@ -46,9 +47,8 @@ dos2unix Changelog
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_sysconfdir}
-mkdir -p %{buildroot}%{_sysconfdir}
-mkdir -p %{buildroot}%{_man3dir}
-mkdir -p %{buildroot}%{_man8dir}
+mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/
+mkdir -p %{buildroot}%{_mandir}/man8
mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
install -m755 -D src/3proxy %{buildroot}%{_bindir}/3proxy
install -m755 -D src/dighosts %{buildroot}%{_bindir}/dighosts
@@ -64,6 +64,19 @@ install -m755 -D src/udppm %{buildroot}%
install -pD -m755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}
install -pD -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.cfg
+ for man in man/*.8 ; do
+ gzip -9c "$man" > "%{buildroot}%{_mandir}/man8/$( basename $man ).gz"
+ touch --reference "$man" "%{buildroot}%{_mandir}/man8/$( basename $man ).gz"
+ done
+
+cat > %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/40-%{name} <<EOF
+#!/bin/sh
+
+ if [ "\$2" = "up" ]; then
+ /sbin/service 3proxy restart || : # reload doesn't work
+ fi
+EOF
+
%clean
rm -rf %{buildroot}
@@ -81,11 +94,20 @@ fi
%defattr(-,root,root,-)
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/%{name}.cfg
+%attr(0755,root,root) %config %{_sysconfdir}/NetworkManager/dispatcher.d/40-%{name}
%{_initrddir}/%{name}
%{_localstatedir}/log/%{name}
%doc Readme Changelog authors copying news
+%{_mandir}/man8/*.8.gz
%changelog
+* Sun Nov 8 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-4
+- Fix BZ#533144:
+- Add reload section to service file, fix stop.
+- Add %%{_sysconfdir}/NetworkManager/dispatcher.d/40-%%{name} (Thanks to Pankaj Pandey)
+- Include man-files.
+- Add Requires: initscripts as owner directory %%{_sysconfdir}/NetworkManager/dispatcher.d/
+
* Thu Aug 20 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-3
- Fedora Review started - thank you Peter Lemenkov.
- Change rights (0755->0644) of config.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 27 Aug 2009 20:14:26 -0000 1.2
+++ sources 9 Nov 2009 11:03:44 -0000 1.3
@@ -1 +1 @@
-2ebd9c06939021f6c2aca31d67782f71 3proxy-0.6.tgz
+5b15eaeb993ca0b048a5bc0f2b53465b 3proxy.init
More information about the fedora-extras-commits
mailing list