rpms/openafs/devel openafs.init, 1.1, 1.2 openafs.spec, 1.1, 1.2 sources, 1.2, 1.3
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17315
Modified Files:
openafs.init openafs.spec sources
Log Message:
* Tue Jun 30 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-3
- Correct rpmlint warnings
- RPMFusion Bug #1047 - Fix SELinux contexts on /afs
- RPMFusion Bug #1275 - service openafs status now sets the exit code
Index: openafs.init
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openafs.init 10 Jun 2010 21:14:05 -0000 1.1
+++ openafs.init 30 Jun 2010 18:31:08 -0000 1.2
@@ -74,25 +74,7 @@
fi
}
-# do you actually have a usable network interface up?
-on_network() {
- ADDRS=`ifconfig | grep 'inet addr' | grep -v 127.0.0.1 | wc -l`
- if [ "$ADDRS" = "" ]; then
- echo $"$0: No interfaces with IP address"
- return 1
- elif [ $ADDRS = 0 ]; then
- echo $"$0: No interfaces with IP address"
- return 1
- fi
- return 0
-}
-
start() {
- on_network
- RETVAL=$?
-
- [ $RETVAL -eq 0 ] || return $RETVAL
-
# Load kernel module
action $"Loading AFS kernel module: " /sbin/modprobe openafs
RETVAL=$?
@@ -205,11 +187,8 @@
fi
;;
status)
- if [ -f /var/lock/subsys/openafs ]; then
- echo $"AFS appears to be running"
- else
- echo $"AFS does not appear to be running"
- fi
+ status afsd
+ RETVAL=$?
;;
*)
echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openafs.spec 10 Jun 2010 21:14:05 -0000 1.1
+++ openafs.spec 30 Jun 2010 18:31:08 -0000 1.2
@@ -13,15 +13,16 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.4.12.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
Source0: http://www.openafs.org/dl/openafs/1.4.12/%{name}-%{version}-src.tar.bz2
-Source1: CellServDB
-Source2: cacheinfo
-Source3: openafs.init
-Source4: afs.conf
+Source1: http://www.openafs.org/dl/openafs/1.4.12/openafs-%{version}-doc.tar.bz2
+Source11: CellServDB
+Source12: cacheinfo
+Source13: openafs.init
+Source14: afs.conf
BuildRoot: %{_tmppath}/%{name}-root
BuildRequires: krb5-devel, pam-devel, ncurses-devel, flex, byacc, bison
@@ -37,12 +38,12 @@
%package client
-Summary: OpenAFS Filesystem client
-Group: System Environment/Daemons
+Summary: OpenAFS Filesystem client
+Group: System Environment/Daemons
Requires(post): bash, coreutils, chkconfig
-Requires: %{name}-kmod >= %{version}
-Requires: openafs = %{version}
-Provides: %{name}-kmod-common = %{version}
+Requires: %{name}-kmod >= %{version}
+Requires: openafs = %{version}
+Provides: %{name}-kmod-common = %{version}
%description client
The AFS distributed filesystem. AFS is a distributed filesystem
@@ -55,9 +56,9 @@
%package devel
-Summary: OpenAFS development header files and static libraries
-Group: Development/Libraries
-Requires: openafs = %{version}-%{release}
+Summary: OpenAFS development header files and static libraries
+Group: Development/Libraries
+Requires: openafs = %{version}-%{release}
Requires(post): /sbin/ldconfig
%description devel
@@ -72,9 +73,9 @@
%package server
-Summary: OpenAFS Filesystem Server
-Group: System Environment/Daemons
-Requires: openafs-client = %{version}, openafs = %{version}
+Summary: OpenAFS Filesystem Server
+Group: System Environment/Daemons
+Requires: openafs-client = %{version}, openafs = %{version}
%description server
The AFS distributed filesystem. AFS is a distributed filesystem
@@ -86,7 +87,7 @@
Cell.
%prep
-%setup -q -n openafs-%{version}
+%setup -q -b 1 -n openafs-%{version}
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
@@ -100,10 +101,15 @@
./regen.sh
# build the user-space bits for base architectures
- %configure \
+ ./configure \
+ --prefix=%{_prefix} \
+ --libdir=%{_libdir} \
+ --bindir=%{_bindir} \
+ --sbindir=%{_sbindir} \
--with-afs-sysname=%{sysname} \
--with-linux-kernel-headers=%{ksource_dir} \
--disable-kernel-module \
+ --disable-strip-binaries \
--with-krb5-conf=/usr/bin/krb5-config
# Build is not SMP compliant
@@ -119,17 +125,17 @@
# install config info
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
-install -p -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
-install -p -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
+install -p -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
+install -p -m 644 %{SOURCE12} ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
echo %{thiscell} > ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs/ThisCell
# install the init script
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
-install -m 755 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/openafs
+install -m 755 %{SOURCE13} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/openafs
# sysconfig file
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/openafs
+install -m 644 %{SOURCE14} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/openafs
# Include the vlclient binary
install -m 755 src/vlserver/vlclient ${RPM_BUILD_ROOT}/usr/sbin/vlclient
@@ -152,7 +158,22 @@
rm -f ${RPM_BUILD_ROOT}/usr/bin/dlog
rm -f ${RPM_BUILD_ROOT}/usr/bin/dpass
-# don't restart in %post because kernel modules could well have changed
+# Install man pages
+tar cf - -C doc/man-pages man1 man5 man8 | \
+ tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+
+# remove unused man pages
+for x in afs_ftpd afs_inetd afs_login afs_rcp afs_rlogind afs_rsh \
+ dkload knfs package runntp symlink symlink_list symlink_make \
+ symlink_remove; do
+ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${x}.1
+done
+
+# rename man page kpasswd to kapasswd
+mv $RPM_BUILD_ROOT%{_mandir}/man1/kpasswd.1 \
+ $RPM_BUILD_ROOT%{_mandir}/man1/kapasswd.1
+
+# don't restart in post because kernel modules could well have changed
%post
/sbin/ldconfig
if [ $1 = 1 ]; then
@@ -163,6 +184,7 @@
# if this is owned by the package, upgrades with afs running can't work
if [ ! -d /afs ] ; then
mkdir -m 700 /afs
+ [ -x /sbin/restorecon ] && /sbin/restorecon /afs
fi
exit 0
@@ -218,6 +240,9 @@
%{_libdir}/libafsrpc.so.*
%{_libdir}/libafssetpag.so.*
/%{_lib}/security/*.so
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
%files client
%defattr(-, root, root)
@@ -271,6 +296,16 @@
%changelog
+* Tue Jun 30 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-3
+- Correct rpmlint warnings
+- RPMFusion Bug #1047 - Fix SELinux contexts on /afs
+- RPMFusion Bug #1275 - service openafs status now sets the exit code
+
+* Wed Jun 16 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-2
+- RPMFusion Bug #1274 - OpenAFS wont start without an IP address
+- RPMFusion Bug #1277 - Include OpenAFS man pages
+- Avoid using the rpm configure macro and call configure directly
+
* Thu Jun 10 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-2
- Port to rawhide
- krb5-devel 1.8 moves where the kerberos tools live
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 10 Jun 2010 21:14:05 -0000 1.2
+++ sources 30 Jun 2010 18:31:08 -0000 1.3
@@ -1 +1,2 @@
+23041583f982796da3965979537a4ef1 openafs-1.4.12.1-doc.tar.bz2
c45a8ca3b4605e9dac25ff435c60d512 openafs-1.4.12.1-src.tar.bz2
13 years, 10 months
rpms/guvcview/F-12 .cvsignore, 1.3, 1.4 guvcview.spec, 1.2, 1.3 sources, 1.3, 1.4
by Thomas Moschny
Author: thm
Update of /cvs/free/rpms/guvcview/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7233/F-12
Modified Files:
.cvsignore guvcview.spec sources
Log Message:
Update to 1.4.1.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/guvcview/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 16 Jun 2010 18:31:25 -0000 1.3
+++ .cvsignore 30 Jun 2010 08:20:33 -0000 1.4
@@ -1 +1 @@
-guvcview-src-1.4.0.tar.gz
+guvcview-src-1.4.1.tar.gz
Index: guvcview.spec
===================================================================
RCS file: /cvs/free/rpms/guvcview/F-12/guvcview.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- guvcview.spec 16 Jun 2010 18:31:26 -0000 1.2
+++ guvcview.spec 30 Jun 2010 08:20:33 -0000 1.3
@@ -1,5 +1,5 @@
Name: guvcview
-Version: 1.4.0
+Version: 1.4.1
Release: 1%{?dist}
Summary: GTK+ UVC Viewer and Capturer
Group: Amusements/Graphics
@@ -68,6 +68,9 @@
%changelog
+* Wed Jun 30 2010 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.4.1-1
+- Update to 1.4.1.
+
* Wed Jun 16 2010 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.4.0-1
- Update to 1.4.0.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/guvcview/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 16 Jun 2010 18:31:26 -0000 1.3
+++ sources 30 Jun 2010 08:20:33 -0000 1.4
@@ -1 +1 @@
-636ef743d939b8c841c86c658c5d8981 guvcview-src-1.4.0.tar.gz
+321e5a51149d5883ebe46ff30f4b01b1 guvcview-src-1.4.1.tar.gz
13 years, 10 months
rpms/guvcview/F-13 .cvsignore, 1.3, 1.4 guvcview.spec, 1.2, 1.3 sources, 1.3, 1.4
by Thomas Moschny
Author: thm
Update of /cvs/free/rpms/guvcview/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6998/F-13
Modified Files:
.cvsignore guvcview.spec sources
Log Message:
Update to 1.4.1.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/guvcview/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 16 Jun 2010 18:30:51 -0000 1.3
+++ .cvsignore 30 Jun 2010 08:19:40 -0000 1.4
@@ -1 +1 @@
-guvcview-src-1.4.0.tar.gz
+guvcview-src-1.4.1.tar.gz
Index: guvcview.spec
===================================================================
RCS file: /cvs/free/rpms/guvcview/F-13/guvcview.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- guvcview.spec 16 Jun 2010 18:30:51 -0000 1.2
+++ guvcview.spec 30 Jun 2010 08:19:40 -0000 1.3
@@ -1,5 +1,5 @@
Name: guvcview
-Version: 1.4.0
+Version: 1.4.1
Release: 1%{?dist}
Summary: GTK+ UVC Viewer and Capturer
Group: Amusements/Graphics
@@ -68,6 +68,9 @@
%changelog
+* Wed Jun 30 2010 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.4.1-1
+- Update to 1.4.1.
+
* Wed Jun 16 2010 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.4.0-1
- Update to 1.4.0.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/guvcview/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 16 Jun 2010 18:30:51 -0000 1.3
+++ sources 30 Jun 2010 08:19:40 -0000 1.4
@@ -1 +1 @@
-636ef743d939b8c841c86c658c5d8981 guvcview-src-1.4.0.tar.gz
+321e5a51149d5883ebe46ff30f4b01b1 guvcview-src-1.4.1.tar.gz
13 years, 10 months
rpms/guvcview/devel .cvsignore, 1.3, 1.4 guvcview.spec, 1.2, 1.3 sources, 1.3, 1.4
by Thomas Moschny
Author: thm
Update of /cvs/free/rpms/guvcview/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6763/devel
Modified Files:
.cvsignore guvcview.spec sources
Log Message:
Update to 1.4.1.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/guvcview/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 16 Jun 2010 18:29:55 -0000 1.3
+++ .cvsignore 30 Jun 2010 08:18:44 -0000 1.4
@@ -1 +1 @@
-guvcview-src-1.4.0.tar.gz
+guvcview-src-1.4.1.tar.gz
Index: guvcview.spec
===================================================================
RCS file: /cvs/free/rpms/guvcview/devel/guvcview.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- guvcview.spec 16 Jun 2010 18:29:55 -0000 1.2
+++ guvcview.spec 30 Jun 2010 08:18:44 -0000 1.3
@@ -1,5 +1,5 @@
Name: guvcview
-Version: 1.4.0
+Version: 1.4.1
Release: 1%{?dist}
Summary: GTK+ UVC Viewer and Capturer
Group: Amusements/Graphics
@@ -68,6 +68,9 @@
%changelog
+* Wed Jun 30 2010 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.4.1-1
+- Update to 1.4.1.
+
* Wed Jun 16 2010 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.4.0-1
- Update to 1.4.0.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/guvcview/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 16 Jun 2010 18:29:55 -0000 1.3
+++ sources 30 Jun 2010 08:18:44 -0000 1.4
@@ -1 +1 @@
-636ef743d939b8c841c86c658c5d8981 guvcview-src-1.4.0.tar.gz
+321e5a51149d5883ebe46ff30f4b01b1 guvcview-src-1.4.1.tar.gz
13 years, 10 months
rpms/openafs/F-13 openafs.init,1.2,1.3 openafs.spec,1.2,1.3
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8702
Modified Files:
openafs.init openafs.spec
Log Message:
* Tue Jun 29 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-3
- RPMFusion Bug #1047 - Fix SELinux contexts on /afs
- RPMFusion Bug #1275 - service openafs status now sets the exit code
Index: openafs.init
===================================================================
RCS file: /cvs/free/rpms/openafs/F-13/openafs.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openafs.init 16 Jun 2010 21:19:22 -0000 1.2
+++ openafs.init 29 Jun 2010 21:46:39 -0000 1.3
@@ -187,11 +187,8 @@
fi
;;
status)
- if [ -f /var/lock/subsys/openafs ]; then
- echo $"AFS appears to be running"
- else
- echo $"AFS does not appear to be running"
- fi
+ status afsd
+ RETVAL=$?
;;
*)
echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-13/openafs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openafs.spec 16 Jun 2010 21:19:22 -0000 1.2
+++ openafs.spec 29 Jun 2010 21:46:39 -0000 1.3
@@ -13,7 +13,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.4.12.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -184,6 +184,7 @@
# if this is owned by the package, upgrades with afs running can't work
if [ ! -d /afs ] ; then
mkdir -m 700 /afs
+ [ -x /sbin/restorecon ] && /sbin/restorecon /afs
fi
exit 0
@@ -295,6 +296,10 @@
%changelog
+* Tue Jun 29 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-3
+- RPMFusion Bug #1047 - Fix SELinux contexts on /afs
+- RPMFusion Bug #1275 - service openafs status now sets the exit code
+
* Wed Jun 16 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-2
- RPMFusion Bug #1274 - OpenAFS wont start without an IP address
- RPMFusion Bug #1277 - Include OpenAFS man pages
13 years, 10 months
rpms/audacity-freeworld/devel audacity-freeworld.spec, 1.13, 1.14 audacity.desktop, 1.2, 1.3
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4135
Modified Files:
audacity-freeworld.spec audacity.desktop
Log Message:
fix icons glob to use realname
add more supported mimetypes and categories to the desktop file
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- audacity-freeworld.spec 27 Jun 2010 14:41:58 -0000 1.13
+++ audacity-freeworld.spec 28 Jun 2010 12:31:32 -0000 1.14
@@ -6,7 +6,7 @@
Conflicts: %{realname}
Version: 1.3.12
-Release: 0.1.1.beta%{?dist}
+Release: 0.1.3.beta%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -149,13 +149,17 @@
%{_mandir}/man*/*
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
-%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/icons/hicolor/*/apps/%{realname}.*
%{_datadir}/mime/packages/*
%doc %{_datadir}/doc/*
%changelog
-* Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.1.1.beta
+* Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.1.3.beta
+- fix icons glob to use realname
+- add more supported mimetypes and categories to the desktop file
+
+* Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.1.2.beta
- upgrade to 1.3.12-beta
- package new icons found in icons/hicolor
Index: audacity.desktop
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audacity.desktop 23 Oct 2009 06:29:58 -0000 1.2
+++ audacity.desktop 28 Jun 2010 12:31:32 -0000 1.3
@@ -6,6 +6,6 @@
Icon=audacity
Terminal=false
Comment=A multitrack audio editor
-MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;application/x-audacity-project;
-Categories=AudioVideo;GNOME;Sequencer;X-Jack;AudioVideoEditing;
+MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;application/x-audacity-project;audio/x-mp3;audio/midi;audio/x-flac;
+Categories=AudioVideo;Audio;GTK;GNOME;Sequencer;X-Jack;AudioVideoEditing;
StartupWMClass=Audacity
13 years, 10 months
rpms/xtables-addons-kmod/devel xtables-addons-kmod.spec,1.4,1.5
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24981
Modified Files:
xtables-addons-kmod.spec
Log Message:
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/xtables-addons-kmod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xtables-addons-kmod.spec 28 Jun 2010 09:14:49 -0000 1.4
+++ xtables-addons-kmod.spec 28 Jun 2010 09:45:14 -0000 1.5
@@ -4,8 +4,8 @@
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
#define buildforkernels newest
-%define buildforkernels current
-#define buildforkernels akmods
+#define buildforkernels current
+%define buildforkernels akmods
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
13 years, 10 months
rpms/xtables-addons/devel ipset-config, NONE, 1.1 ipset.init, NONE, 1.1 xtables-addons-userspace.patch, NONE, 1.1 xtables-addons.spec, NONE, 1.1
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24556
Added Files:
ipset-config ipset.init xtables-addons-userspace.patch
xtables-addons.spec
Log Message:
--- NEW FILE ipset-config ---
# Unload modules on restart and stop
# Value: yes|no, default: yes
# This option has to be 'yes' to get to a sane state for an ipset
# restart or stop. Only set to 'no' if there are problems unloading ipset
# modules.
IPSET_MODULES_UNLOAD="yes"
# Save current ipset rules on stop.
# Value: yes|no, default: no
# Saves all ipset rules to /etc/sysconfig/ipset if ipset gets stopped
# (e.g. on system shutdown).
IPSET_SAVE_ON_STOP="no"
# Save current ipset rules on restart.
# Value: yes|no, default: no
# Saves all ipset rules to /etc/sysconfig/ipset if ipset gets
# restarted.
IPSET_SAVE_ON_RESTART="no"
# Numeric status output
# Value: yes|no, default: yes
# Print IP addresses and port numbers in numeric format in the status output.
IPSET_STATUS_NUMERIC="yes"
# Sorted status output
# Value: yes|no, default: yes
# List sorted entries in the status output.
IPSET_STATUS_SORTED="yes"
--- NEW FILE ipset.init ---
#!/bin/sh
#
# ipset Startup script for ipset
#
# chkconfig: - 07 93
# description: Starts, stops and saves ipset
#
# config: /etc/sysconfig/ipset
# config: /etc/sysconfig/ipset-config
#
### BEGIN INIT INFO
# Provides: ipset
# Required-Start:
# Required-Stop:
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: start and stop ipset
# Description: Start, stop and save ipset
### END INIT INFO
# Source function library.
. /etc/init.d/functions
IPSET=ipset
IPSET_DATA=/etc/sysconfig/$IPSET
IPSET_CONFIG=/etc/sysconfig/${IPSET}-config
VAR_SUBSYS_IPSET=/var/lock/subsys/$IPSET
if [ ! -x /sbin/$IPSET ]; then
echo -n $"${IPSET}: /sbin/$IPSET does not exist."; warning; echo
exit 5
fi
# Default ipset configuration:
IPSET_MODULES_UNLOAD="yes"
IPSET_SAVE_ON_STOP="no"
IPSET_SAVE_ON_RESTART="no"
IPSET_STATUS_NUMERIC="yes"
IPSET_STATUS_SORTED="yes"
# Load ipset configuration.
[ -f "$IPSET_CONFIG" ] && . "$IPSET_CONFIG"
# Ipset modules
IPSET_MODULES=($(lsmod | awk "/^ip_set[_ ]/ {print \$1}"))
rmmod_r() {
# Unload module with all referring modules.
# At first all referring modules will be unloaded, then the module itself.
local mod=$1
local ret=0
local ref=
# Get referring modules.
ref=$(lsmod | awk "/^${mod}/ { print \$4; }" | tr ',' ' ')
# recursive call for all referring modules
for i in $ref; do
rmmod_r $i
let ret+=$?;
done
# Unload module.
# The extra test is for 2.6: The module might have autocleaned,
# after all referring modules are unloaded.
if grep -q "^${mod}" /proc/modules ; then
modprobe -r $mod > /dev/null 2>&1
res=$?
[ $res -eq 0 ] || echo -n " $mod"
let ret+=$res;
fi
return $ret
}
flush_n_delete() {
local use=
# Check if ipset module is loaded.
[ -z "$IPSET_MODULES" ] && return 0
# Get ipt_set modules use count.
use=$(lsmod | awk "/^ipt_(set|SET) / {print \$3}")
# Exit if ipset is in use.
if [ -n "$use" ]; then
for i in $use; do
if [ $i -gt 0 ]; then
echo -n $"${IPSET}: Set is in use, operation not permitted."; warning; echo
exit 1
fi
done
fi
# Flush ipset rules and delete sets.
echo -n $"${IPSET}: Flushing ipset rules: "
ret=0
# Flush ipset rules.
$IPSET -F;
let ret+=$?;
# Delete ipset sets.
$IPSET -X;
let ret+=$?;
[ $ret -eq 0 ] && success || failure
echo
return $ret
}
start() {
# Do not start if there is no config file.
[ ! -f "$IPSET_DATA" ] && return 6
flush_n_delete
echo -n $"${IPSET}: Applying ipset rules: "
$IPSET --restore < $IPSET_DATA
if [ $? -eq 0 ]; then
success; echo
else
failure; echo; return 1
fi
touch $VAR_SUBSYS_IPSET
return $ret
}
stop() {
# Do not stop if ipset module is not loaded.
[ -z "$IPSET_MODULES" ] && return 0
flush_n_delete
if [ "x$IPSET_MODULES_UNLOAD" = "xyes" ]; then
echo -n $"${IPSET}: Unloading modules: "
ret=0
for mod in ${IPSET_MODULES[*]}; do
rmmod_r $mod
let ret+=$?;
done
[ $ret -eq 0 ] && success || failure
echo
fi
rm -f $VAR_SUBSYS_IPSET
return $ret
}
save() {
# Check if ipset module is loaded
[ -z "$IPSET_MODULES" ] && return 0
echo -n $"${IPSET}: Saving ipset rules to $IPSET_DATA: "
ret=0
TMP_FILE=$(/bin/mktemp -q /tmp/$IPSET.XXXXXX) \
&& chmod 600 "$TMP_FILE" \
&& $IPSET --save > $TMP_FILE 2>/dev/null \
&& size=$(stat -c '%s' $TMP_FILE) && [ $size -gt 0 ] \
|| ret=1
if [ $ret -eq 0 ]; then
if [ -e $IPSET_DATA ]; then
cp -f $IPSET_DATA $IPSET_DATA.save \
&& chmod 600 $IPSET_DATA.save \
|| ret=1
fi
if [ $ret -eq 0 ]; then
cp -f $TMP_FILE $IPSET_DATA \
&& chmod 600 $IPSET_DATA \
|| ret=1
fi
fi
[ $ret -eq 0 ] && success || failure
echo
rm -f $TMP_FILE
return $ret
}
status() {
# Do not print status if lockfile is missing and ipset modules are not
# loaded.
if [ ! -f "$VAR_SUBSYS_IPSET" -a -z "$IPSET_MODULES" ]; then
echo $"${IPSET}: Ipset is not running."
return 3
fi
# Check if ipset modules are loaded
if [ -z "$IPSET_MODULES" ]; then
echo $"${IPSET}: Ipset modules are not loaded."
return 3
fi
NUM=
[ "x$IPSET_STATUS_NUMERIC" = "xyes" ] && NUM="-n"
SORT=
[ "x$IPSET_STATUS_SORTED" = "xyes" ] && SORT="--sorted"
$IPSET --list $NUM $SORT && echo
return 0
}
restart() {
[ "x$IPSET_SAVE_ON_RESTART" = "xyes" ] && save
stop
start
}
case "$1" in
start)
[ -f "$VAR_SUBSYS_IPSET" ] && exit 0
start
RETVAL=$?
;;
stop)
[ "x$IPSET_SAVE_ON_STOP" = "xyes" ] && save
stop
RETVAL=$?
;;
restart|force-reload)
restart
RETVAL=$?
;;
condrestart|try-restart)
[ ! -e "$VAR_SUBSYS_IPSET" ] && exit 0
restart
RETVAL=$?
;;
status)
status
RETVAL=$?
;;
save)
save
RETVAL=$?
;;
*)
echo $"Usage: ${IPSET} {start|stop|restart|condrestart|status|save}"
RETVAL=2
;;
esac
exit $RETVAL
xtables-addons-userspace.patch:
Makefile.am | 1 -
configure.ac | 47 -----------------------------------------------
extensions/Makefile.am | 22 ----------------------
3 files changed, 70 deletions(-)
--- NEW FILE xtables-addons-userspace.patch ---
diff -urP xtables-addons-1.27.org/configure.ac xtables-addons-1.27/configure.ac
--- xtables-addons-1.27.org/configure.ac 2010-05-31 09:47:58.385362271 +0800
+++ xtables-addons-1.27/configure.ac 2010-05-31 10:01:32.727112933 +0800
@@ -9,18 +9,6 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_ARG_WITH([kbuild],
- AS_HELP_STRING([--with-kbuild=PATH],
- [Path to kernel build directory [[/lib/modules/CURRENT/build]]]),
- [kbuilddir="$withval"],
- [kbuilddir="/lib/modules/$(uname -r)/build"])
-#
-# check for --without-kbuild
-#
-if [[ "$kbuilddir" == no ]]; then
- kbuilddir="";
-fi
-
AC_ARG_WITH([xtlibdir],
AS_HELP_STRING([--with-xtlibdir=PATH],
[Path where to install Xtables extensions [[LIBEXECDIR/xtables]]]),
@@ -37,42 +25,7 @@
-Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
-I\${XA_TOPSRCDIR}/include";
-#
-# check kernel version
-#
-if grep -q "CentOS release 5\." /etc/redhat-release 2>/dev/null ||
- grep -q "Red Hat Enterprise Linux Server release 5" /etc/redhat-release 2>/dev/null; then
- # しまった!
- # Well, just a warning. Maybe the admin updated the kernel.
- echo "WARNING: This distribution's shipped kernel is not supported.";
-fi;
-krel="$(make -sC ${kbuilddir} kernelrelease)";
-krel="${krel%%-*}";
-kmajor="${krel%%.*}";
-krel="${krel#*.}";
-kminor="${krel%%.*}";
-krel="${krel#*.}";
-kmicro="${krel%%.*}";
-if test "$kmicro" = "$krel"; then
- kstable=0;
-else
- kstable="${krel#*.}";
- if test -z "$kstable"; then
- kstable=0;
- fi;
-fi;
-echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
-if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 35; then
- echo "WARNING: You are trying a newer kernel. Results may vary. :-)";
-elif test \( "$kmajor" -lt 2 -o "$kminor" -lt 6 -o "$kmicro" -lt 17 \) -o \
- \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \
- "$kstable" -lt 5 \); then
- echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration.";
- exit 1;
-fi;
-
AC_SUBST([regular_CFLAGS])
-AC_SUBST([kbuilddir])
AC_SUBST([xtlibdir])
AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
extensions/Makefile extensions/ACCOUNT/Makefile
diff -urP xtables-addons-1.27.org/extensions/Makefile.am xtables-addons-1.27/extensions/Makefile.am
--- xtables-addons-1.27.org/extensions/Makefile.am 2010-05-31 09:47:58.363361712 +0800
+++ xtables-addons-1.27/extensions/Makefile.am 2010-05-31 10:02:08.845363738 +0800
@@ -1,26 +1,4 @@
# -*- Makefile -*-
# AUTOMAKE
-# Not having Kbuild in Makefile.extra because it will already recurse
-.PHONY: modules modules_install clean_modules
-
-_kcall = -C ${kbuilddir} M=${abs_srcdir}
-
-modules:
- @echo -n "Xtables-addons ${PACKAGE_VERSION} - Linux "
- @if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} --no-print-directory -s kernelrelease; fi;
- ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} modules; fi;
-
-modules_install:
- ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} INSTALL_MOD_PATH=${DESTDIR} ext-mod-dir='$${INSTALL_MOD_DIR}' modules_install; fi;
-
-clean_modules:
- ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} clean; fi;
-
-all-local: modules
-
-install-exec-local: modules_install
-
-clean-local: clean_modules
-
include ../Makefile.extra
diff -urP xtables-addons-1.27.org/Makefile.am xtables-addons-1.27/Makefile.am
--- xtables-addons-1.27.org/Makefile.am 2010-05-31 09:47:58.385362271 +0800
+++ xtables-addons-1.27/Makefile.am 2010-05-31 09:52:19.632360246 +0800
@@ -12,7 +12,6 @@
${MAKE} -f Makefile.mans all;
install-exec-hook:
- depmod -a || :;
config.status: Makefile.iptrules.in
--- NEW FILE xtables-addons.spec ---
Name: xtables-addons
Summary: Extensions targets and matches for iptables
Version: 1.27
Release: 2%{?dist}
# The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2
License: GPLv2 and LGPLv2
Group: System Environment/Base
URL: http://xtables-addons.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
Source1: ipset.init
Source2: ipset-config
# patch to build userspace part only
Patch0: %{name}-userspace.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: iptables-devel
BuildRequires: autoconf automake libtool
Provides: %{name}-kmod-common = %{version}
Requires: %{name}-kmod >= %{version}
Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
Requires(postun): initscripts
Provides: ipset = 4.2
%{?_isa:Provides: ipset%{?_isa} = 4.2}
Obsoletes: %{name}-devel < 1.27-1
%description
Xtables-addons provides extra modules for iptables not present in the kernel,
and is the successor of patch-o-matic. Extensions includes new targets like
TEE, TARPIT, CHAOS, or modules like geoip, ipset, and account.
This package provides the userspace libraries for iptables to use extensions
in the %{name}-kmod package. You must also install the
%{name}-kmod package.
%prep
%setup -q
%patch0 -p1
if [ -e /%{_lib}/xtables/libxt_TEE.so ]; then
sed -i 's/build_TEE=m/build_TEE=/' mconfig
fi
%build
./autogen.sh
%configure -with-xtlibdir=/%{_lib}/xtables
make V=1 %{?_smp_mflags}
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
# move ipset to /sbin
install -d %{buildroot}/sbin
mv %{buildroot}/%{_sbindir}/ipset %{buildroot}/sbin
# There is no -devel package. So no need for these files
rm -f %{buildroot}%{_libdir}/*.{la,so}
# install init scripts and configuration files
install -D -pm 0755 %{SOURCE1} %{buildroot}%{_initddir}/ipset
install -D -pm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ipset-config
%post
/sbin/ldconfig
/sbin/chkconfig --add ipset
%preun
if [ $1 = 0 ] ; then
/sbin/service ipset stop >/dev/null 2>&1
/sbin/chkconfig --del ipset
fi
%postun
/sbin/ldconfig
if [ "$1" -ge "1" ] ; then
/sbin/service ipset condrestart >/dev/null 2>&1 || :
fi
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc LICENSE README doc/*
%attr(0755,root,root) %{_initddir}/*
%config(noreplace) %{_sysconfdir}/sysconfig/*
/%{_lib}/xtables/*.so
%{_libdir}/*.so.*
/sbin/ipset
%{_sbindir}/*
%{_mandir}/man?/*
%changelog
* Mon Jun 28 2010 Chen Lei <supercyper(a)163.com> - 1.27-2
- rebuild for kernel 2.6.35
* Mon May 31 2010 Chen Lei <supercyper(a)163.com> - 1.27-1
- update to 1.27
* Sun May 02 2010 Chen Lei <supercyper(a)163.com> - 1.26-1
- update to 1.26
* Mon Apr 26 2010 Chen Lei <supercyper(a)163.com> - 1.25-1
- update to 1.25
* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.24-2
- rebuilt
* Thu Mar 18 2010 Chen Lei <supercyper(a)163.com> - 1.24-1
- initial rpm build
13 years, 10 months
rpms/xtables-addons/devel sources,1.1,1.2
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24500
Modified Files:
sources
Log Message:
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 12 Apr 2010 20:53:12 -0000 1.1
+++ sources 28 Jun 2010 09:40:00 -0000 1.2
@@ -0,0 +1 @@
+f4f65ce5361d7f8c0908ca3db37fa8ee xtables-addons-1.27.tar.xz
13 years, 10 months
rpms/xtables-addons-kmod/devel xtables-addons-kmod.spec,1.3,1.4
by Chen Lei
Author: supercyper
Update of /cvs/free/rpms/xtables-addons-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22646
Modified Files:
xtables-addons-kmod.spec
Log Message:
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/xtables-addons-kmod.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xtables-addons-kmod.spec 28 Jun 2010 08:57:31 -0000 1.3
+++ xtables-addons-kmod.spec 28 Jun 2010 09:14:49 -0000 1.4
@@ -41,7 +41,7 @@
%setup -q -c -T -a 0
for kernel_version in %{?kernel_versions} ; do
cp -a xtables-addons-%{version} _kmod_build_${kernel_version%%___*}
- if grep -q 'XT_TARGET_TEE=m' %{_usrsrc}/${kernel_version%%___*}/.config; then
+ if grep -q 'XT_TARGET_TEE=m' %{_usrsrc}/kernels/${kernel_version%%___*}/.config; then
pushd _kmod_build_${kernel_version%%___*}
sed -i 's/build_TEE=m/build_TEE=/' mconfig
popd
13 years, 10 months