rpms/suck/devel suck-4.3.2-samples.patch,1.2,1.3 suck.spec,1.26,1.27
Jochen Schmitt
s4504kr at fedoraproject.org
Wed Jul 7 15:11:40 UTC 2010
Author: s4504kr
Update of /cvs/extras/rpms/suck/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12784
Modified Files:
suck-4.3.2-samples.patch suck.spec
Log Message:
move getnews into /usr/libexec/news
suck-4.3.2-samples.patch:
get.news.generic | 18 ++++++----
get.news.inn | 91 +++++++++++++++++++++++++++++++++++++++++--------------
put.news | 7 +++-
put.news.sm | 9 +++--
put.news.sm.pl | 2 -
5 files changed, 91 insertions(+), 36 deletions(-)
Index: suck-4.3.2-samples.patch
===================================================================
RCS file: /cvs/extras/rpms/suck/devel/suck-4.3.2-samples.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- suck-4.3.2-samples.patch 11 Sep 2007 15:49:12 -0000 1.2
+++ suck-4.3.2-samples.patch 7 Jul 2010 15:11:40 -0000 1.3
@@ -1,7 +1,45 @@
+diff -up suck-4.3.2/sample/get.news.generic.samp suck-4.3.2/sample/get.news.generic
+--- suck-4.3.2/sample/get.news.generic.samp 1999-02-20 00:32:57.000000000 +0100
++++ suck-4.3.2/sample/get.news.generic 2010-06-30 18:53:38.836787236 +0200
+@@ -9,24 +9,26 @@
+ REMOTE_HOST=news.pixi.com
+ LOCAL_HOST=localhost
+
+-SPOOLDIR=/usr/spool/news # base directory for articles to be rposted
+-NEWSDIR=/usr/lib/news # base directory for news binaries
+-BASEDIR=/home/boby/doNews # base directory for suck rpost and scripts
++SPOOLDIR=/var/spool/news # base directory for articles to be rposted
++NEWSDIR=/usr/libexec/news # base directory for news binaries
++BASEDIR=/var/lib/news/suck # base directory for suck rpost and scripts
+
+-SHLOCK=${NEWSDIR}/bin/shlock
++SHLOCK=${NEWSDIR}/shlock
+
+ TMPDIR=${BASEDIR} # location for suck.* files
+ MSGDIR=${BASEDIR}/Msgs # where to put MultiFile articles when getting them
+
+-OUTGOING=${SPOOLDIR}/out.going/pixi # location of the list of articles to upload
++SITE=pixie
++
++OUTGOING=${SPOOLDIR}/outgoing/${SITE} # location of the list of articles to upload
+ SCRIPT=${BASEDIR}/put.news # my filter for rpost
+ OUTFILE=/tmp/tmp$$ # used by rpost as article after it is filtered
+ LOCKFILE=${BASEDIR}/getnews.lock # lock file to prevent multiple instances of script
+
+ TESTHOST=testhost
+-RPOST=rpost
+-SUCK=suck
+-TESTHOST=testhost
++RPOST=${NEWSDIR}/rpost
++SUCK=${NEWSDIR}/suck
++TESTHOST=${NEWSDIR}/testhost
+
+ # if we are already running, abort
+
diff -up suck-4.3.2/sample/get.news.inn.samp suck-4.3.2/sample/get.news.inn
--- suck-4.3.2/sample/get.news.inn.samp 1997-09-27 09:29:59.000000000 +0200
-+++ suck-4.3.2/sample/get.news.inn 2007-09-10 17:43:34.000000000 +0200
-@@ -5,12 +5,11 @@
++++ suck-4.3.2/sample/get.news.inn 2010-06-30 18:55:49.256663220 +0200
+@@ -5,32 +5,37 @@
#NOTE: this script probably needs to be run by root. Most systems will
# not let a normal user run ctlinnd
@@ -9,14 +47,17 @@ diff -up suck-4.3.2/sample/get.news.inn.
LOCAL_HOST=localhost
-SPOOLDIR=/usr/spool/news # base directory for articles to be rposted
-+SPOOLDIR=/var/spool/news # base directory for articles to be rposted
- NEWSDIR=/usr/lib/news # base directory for news binaries
+-NEWSDIR=/usr/lib/news # base directory for news binaries
-BASEDIR=/home/boby/doNews # base directory for scripts and data files
++SPOOLDIR=/var/spool/news # base directory for articles to be rposted
++NEWSDIR=/usr/libexec/news # base directory for news binaries
+BASEDIR=/var/lib/news/suck # base directory for scripts and data files
- CTLINND=${NEWSDIR}/bin/ctlinnd # location of binary
- SHLOCK=${NEWSDIR}/bin/shlock # location of binary
-@@ -18,12 +17,7 @@ SHLOCK=${NEWSDIR}/bin/shlock # location
+-CTLINND=${NEWSDIR}/bin/ctlinnd # location of binary
+-SHLOCK=${NEWSDIR}/bin/shlock # location of binary
++CTLINND=${NEWSDIR}/ctlinnd # location of binary
++SHLOCK=${NEWSDIR}/shlock # location of binary
+
TMPDIR=${BASEDIR} # location for suck.* files
MSGDIR=${BASEDIR}/Msgs # where to put MultiFile messages when getting them
@@ -30,10 +71,14 @@ diff -up suck-4.3.2/sample/get.news.inn.
OUTFILE=/tmp/tmp$$ # used by rpost as article after it is filtered
LOCKFILE=${BASEDIR}/getnews.lock # lock file to prevent multiple instances of script
NEWSGROUP=news # which group owns the file in out.going, typically either news or uucp.
-@@ -32,6 +26,17 @@ TESTHOST=testhost
- RPOST=rpost
- SUCK=suck
+-TESTHOST=testhost
+-RPOST=rpost
+-SUCK=suck
++TESTHOST=${NEWSDIR}/testhost
++RPOST=${NEWSDIR}/rpost
++SUCK=${NEWSDIR}/suck
++
+if [ $# -gt 1 ]; then
+ echo "Usage: getnew [<sitename>]"
+ exit
@@ -44,10 +89,9 @@ diff -up suck-4.3.2/sample/get.news.inn.
+else
+ CONFIG=/etc/sysconfig/suck/site
+fi
-+
+
# if we are already running, abort
- trap 'rm -f ${LOCKFILE} ; echo "Aborting" ; exit 1' 1 2 3 15
@@ -41,18 +46,55 @@ if [ $? -ne 0 ]; then
exit
fi
@@ -148,60 +192,9 @@ diff -up suck-4.3.2/sample/get.news.inn.
echo "You can hang up the modem now"
fi
-diff -up suck-4.3.2/sample/put.news.sm.samp suck-4.3.2/sample/put.news.sm
---- suck-4.3.2/sample/put.news.sm.samp 2002-06-04 15:20:16.000000000 +0200
-+++ suck-4.3.2/sample/put.news.sm 2007-09-10 17:40:27.000000000 +0200
-@@ -10,15 +10,18 @@
- # this to somewhere normal users can read or write.
-
- TMPFILE=/tmp/tmp$$
--SEDCMD="/^NNTP-Posting-Host/d"
-+SEDCMD="/^NNTP-Posting/d"
- SEDCMD2="/^Xref/d"
-+SEDCMD3="/^X-Tra/d"
-+SEDCMD4="/^X-Comp/d"
- OUTFILE=$2
-
--/usr/news/bin/sm $1 > $TMPFILE
-+/usr/lib/news/bin/sm $1 > $TMPFILE
-
- if [ -f ${TMPFILE} ]; then
-
-- sed -e ${SEDCMD} ${TMPFILE} | sed -e ${SEDCMD2} > ${OUTFILE}
-+ sed -e ${SEDCMD} ${TMPFILE} | sed -e ${SEDCMD2} | \
-+ sed -e ${SEDCMD3} | sed -e ${SEDCMD4} > ${OUTFILE}
-
- if [ $? -ne 0 ]; then
- echo "Error"
-diff -up suck-4.3.2/sample/get.news.generic.samp suck-4.3.2/sample/get.news.generic
---- suck-4.3.2/sample/get.news.generic.samp 1999-02-20 00:32:57.000000000 +0100
-+++ suck-4.3.2/sample/get.news.generic 2007-09-10 17:40:27.000000000 +0200
-@@ -9,16 +9,18 @@
- REMOTE_HOST=news.pixi.com
- LOCAL_HOST=localhost
-
--SPOOLDIR=/usr/spool/news # base directory for articles to be rposted
--NEWSDIR=/usr/lib/news # base directory for news binaries
--BASEDIR=/home/boby/doNews # base directory for suck rpost and scripts
-+SPOOLDIR=/var/spool/news # base directory for articles to be rposted
-+NEWSDIR=/var/lib/news # base directory for news binaries
-+BASEDIR=/var/lib/news/suck # base directory for suck rpost and scripts
-
- SHLOCK=${NEWSDIR}/bin/shlock
-
- TMPDIR=${BASEDIR} # location for suck.* files
- MSGDIR=${BASEDIR}/Msgs # where to put MultiFile articles when getting them
-
--OUTGOING=${SPOOLDIR}/out.going/pixi # location of the list of articles to upload
-+SITE=pixie
-+
-+OUTGOING=${SPOOLDIR}/outgoing/${SITE} # location of the list of articles to upload
- SCRIPT=${BASEDIR}/put.news # my filter for rpost
- OUTFILE=/tmp/tmp$$ # used by rpost as article after it is filtered
- LOCKFILE=${BASEDIR}/getnews.lock # lock file to prevent multiple instances of script
diff -up suck-4.3.2/sample/put.news.samp suck-4.3.2/sample/put.news
--- suck-4.3.2/sample/put.news.samp 1998-10-04 21:32:26.000000000 +0200
-+++ suck-4.3.2/sample/put.news 2007-09-10 17:40:27.000000000 +0200
++++ suck-4.3.2/sample/put.news 2010-06-30 18:47:37.270786284 +0200
@@ -14,14 +14,17 @@ if [ $# -ne 2 ]; then
exit -1
fi
@@ -224,13 +217,38 @@ diff -up suck-4.3.2/sample/put.news.samp
echo "Error"
diff -up suck-4.3.2/sample/put.news.sm.pl.samp suck-4.3.2/sample/put.news.sm.pl
--- suck-4.3.2/sample/put.news.sm.pl.samp 2002-06-04 15:20:43.000000000 +0200
-+++ suck-4.3.2/sample/put.news.sm.pl 2007-09-10 17:40:27.000000000 +0200
++++ suck-4.3.2/sample/put.news.sm.pl 2010-06-30 18:47:37.271786312 +0200
@@ -26,7 +26,7 @@ sub perl_rpost {
# rpost will then handle the error
# We do this since rpost can't differentiate between
# a missing file or a script file
- open IFP, "/usr/news/bin/sm $infile |" or return $infile;
-+ open IFP, "/usr/lib/news/bin/sm $infile |" or return $infile;
++ open IFP, "/usr/libexec/news/sm $infile |" or return $infile;
# open IFP, "<${infile}" or die "Can't read ${infile}";
open OFP, ">${outfile}" or die "Can't create ${outfile}";
+diff -up suck-4.3.2/sample/put.news.sm.samp suck-4.3.2/sample/put.news.sm
+--- suck-4.3.2/sample/put.news.sm.samp 2002-06-04 15:20:16.000000000 +0200
++++ suck-4.3.2/sample/put.news.sm 2010-06-30 18:47:37.271786312 +0200
+@@ -10,15 +10,18 @@
+ # this to somewhere normal users can read or write.
+
+ TMPFILE=/tmp/tmp$$
+-SEDCMD="/^NNTP-Posting-Host/d"
++SEDCMD="/^NNTP-Posting/d"
+ SEDCMD2="/^Xref/d"
++SEDCMD3="/^X-Tra/d"
++SEDCMD4="/^X-Comp/d"
+ OUTFILE=$2
+
+-/usr/news/bin/sm $1 > $TMPFILE
++/usr/lib/news/bin/sm $1 > $TMPFILE
+
+ if [ -f ${TMPFILE} ]; then
+
+- sed -e ${SEDCMD} ${TMPFILE} | sed -e ${SEDCMD2} > ${OUTFILE}
++ sed -e ${SEDCMD} ${TMPFILE} | sed -e ${SEDCMD2} | \
++ sed -e ${SEDCMD3} | sed -e ${SEDCMD4} > ${OUTFILE}
+
+ if [ $? -ne 0 ]; then
+ echo "Error"
Index: suck.spec
===================================================================
RCS file: /cvs/extras/rpms/suck/devel/suck.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- suck.spec 2 Jun 2010 08:41:11 -0000 1.26
+++ suck.spec 7 Jul 2010 15:11:40 -0000 1.27
@@ -1,7 +1,7 @@
Name: suck
Summary: Download news from remote NNTP server
Version: 4.3.2
-Release: 30%{?dist}
+Release: 31%{?dist}
Source: http://www.sucknews.org/%{name}-%{version}.tar.gz
Source1: active-ignore
Source2: suck-4.3.2.site
@@ -16,9 +16,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
License: Public Domain
Group: System Environment/Daemons
-BuildRequires: inn-devel >= 2.4.5-2, perl-devel >= 3:5.8 perl(ExtUtils::Embed)
+BuildRequires: inn-devel >= 2.5.2, perl-devel >= 3:5.8 perl(ExtUtils::Embed)
BuildRequires: openssl-devel, autoconf
-Requires: inn >= 2.4.5-2
+Requires: inn >= 2.5.2
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Conflicts: leafnode
@@ -38,7 +38,7 @@ with most standard NNTP servers, includi
cp %{SOURCE3} .
autoconf
-%configure --with-inn-lib=%{_libdir}/news/lib \
+%configure --with-inn-lib=%{_libdir} \
--with-inn-include=%{_includedir}/inn
%build
@@ -47,15 +47,14 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=${RPM_BUILD_ROOT} \
- bindir=${RPM_BUILD_ROOT}%{_bindir} \
+ bindir=${RPM_BUILD_ROOT}%{_libexecdir}/news \
mandir=${RPM_BUILD_ROOT}%{_mandir}/man1
mkdir -p ${RPM_BUILD_ROOT}/var/lib/news/suck
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/suck
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/news/suck.d
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/news/bin
-cp sample/get.news.inn ${RPM_BUILD_ROOT}%{_prefix}/lib/news/bin/getnews
+cp sample/get.news.inn ${RPM_BUILD_ROOT}%{_libexecdir}/news/getnews
cp sample/put.news.sm ${RPM_BUILD_ROOT}/var/lib/news/suck/
cp sample/put.news.sm.pl ${RPM_BUILD_ROOT}/var/lib/news/suck/
cp %{SOURCE1} ${RPM_BUILD_ROOT}/var/lib/news/suck
@@ -66,16 +65,16 @@ rm -rf $RPM_BUILD_ROOT
%files
-%defattr(0644,root,root,0755)
+%defattr(0644,root,root,-)
%doc README CHANGELOG sample README.Fedora
-%defattr(-,root,root,0755)
-%{_bindir}/suck
-%{_bindir}/rpost
-%{_bindir}/testhost
-%{_bindir}/lmove
-%{_prefix}/lib/news/bin/getnews
-%attr(-,news,news) %dir /var/lib/news/suck/
+%defattr(-,root,root,-)
+%attr(0774,news,root) %{_libexecdir}/news/suck
+%attr(0774,news,root) %{_libexecdir}/news/rpost
+%attr(0755,root,root) %{_libexecdir}/news/testhost
+%attr(0774,news,root) %{_libexecdir}/news/lmove
+%attr(0774,news,root) %{_libexecdir}/news/getnews
+%attr(0775,news,news) %dir /var/lib/news/suck/
/var/lib/news/suck/put.news.sm
/var/lib/news/suck/put.news.sm.pl
/var/lib/news/suck/active-ignore
@@ -84,18 +83,21 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/testhost.1*
%{_mandir}/man1/lmove.1*
-%dir %{_sysconfdir}/sysconfig/suck/
+%attr(0755,root,root) %dir %{_sysconfdir}/sysconfig/suck/
%config(noreplace) %{_sysconfdir}/sysconfig/suck/site
-%dir %{_sysconfdir}/news/suck.d/
+%attr(0755,root,root) %dir %{_sysconfdir}/news/suck.d/
%changelog
-* Wed Jun 02 2010 Marcela Maslanova <mmaslano at redhat.com> - 4.3.2-30
+* Wed Jun 30 2010 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-31
+- move getnews into %%{_libexecdir}/news
+
+* Wed Jun 02 2010 Marcela Maslanova <mmaslano at redhat.com> 4.3.2-30
- Mass rebuild with perl-5.12.0
-* Mon Dec 7 2009 Stepan Kasal <skasal at redhat.com> - 4.3.2-29
+* Mon Dec 7 2009 Stepan Kasal <skasal at redhat.com> 4.3.2-29
- rebuild against perl 5.10.1
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.3.2-28
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> 4.3.2-28
- rebuilt with new openssl
* Wed Aug 12 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.3.2-27
More information about the scm-commits
mailing list