rpms/oidentd/devel oidentd-2.0.8-linux-2.6.21.patch, NONE, 1.1 oidentd.spec, 1.12, 1.13

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/oidentd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17230

Modified Files:
	oidentd.spec 
Added Files:
	oidentd-2.0.8-linux-2.6.21.patch 
Log Message:
Include masquerade patch fix for 2.6.21+ (#247868, Vilius Å umskas) and update license field.


oidentd-2.0.8-linux-2.6.21.patch:

--- NEW FILE oidentd-2.0.8-linux-2.6.21.patch ---
diff -ur oidentd.orig/src/kernel/linux.c oidentd-2.0.8/src/kernel/linux.c
--- oidentd.orig/src/kernel/linux.c	2006-05-22 06:58:53.000000000 +0300
+++ oidentd-2.0.8/src/kernel/linux.c	2007-07-11 21:28:56.000000000 +0300
@@ -48,6 +48,7 @@
 #define CFILE6		"/proc/net/tcp6"
 #define MASQFILE	"/proc/net/ip_masquerade"
 #define CONNTRACK	"/proc/net/ip_conntrack"
+#define NFCONNTRACK	"/proc/net/nf_conntrack"
 
 static int netlink_sock;
 extern struct sockaddr_storage proxy;
@@ -82,7 +83,15 @@
 				debug("fopen: %s: %s", CONNTRACK, strerror(errno));
 				return false;
 			}
-			masq_fp = fopen("/dev/null", "r");
+
+			masq_fp = fopen(NFCONNTRACK, "r");
+			if (masq_fp == NULL) {
+				if (errno != ENOENT) {
+					debug("fopen: %s: %s", NFCONNTRACK, strerror(errno));
+					return false;
+				}
+				masq_fp = fopen("/dev/null", "r");
+			}
 		}
 
 		netfilter = true;
@@ -367,6 +376,15 @@
 				&nport_temp, &mport_temp);
 			}
 
+			if (ret != 21) {
+				ret = sscanf(buf,
+					"%*15s %*d %15s %*d %*d ESTABLISHED src=%d.%d.%d.%d dst=%d.%d.%d.%d sport=%d dport=%d packets=%*d bytes=%*d src=%d.%d.%d.%d dst=%d.%d.%d.%d sport=%d dport=%d",
+				proto, &l1, &l2, &l3, &l4, &r1, &r2, &r3, &r4,
+				&masq_lport_temp, &masq_fport_temp,
+				&nl1, &nl2, &nl3, &nl4, &nr1, &nr2, &nr3, &nr4,
+				&nport_temp, &mport_temp);
+			}
+
 			if (ret != 21)
 				continue;
 


Index: oidentd.spec
===================================================================
RCS file: /cvs/extras/rpms/oidentd/devel/oidentd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- oidentd.spec	28 Aug 2006 11:24:30 -0000	1.12
+++ oidentd.spec	6 Aug 2007 11:15:51 -0000	1.13
@@ -1,13 +1,16 @@
 Summary: Implementation of the RFC1413 identification server
 Name: oidentd
 Version: 2.0.8
-Release: 2%{?dist}
-License: GPL
+Release: 3%{?dist}
+# A few files taken from other projects are GPLv2+, but the core of oidentd
+# is definitely GPLv2 only.
+License: GPLv2
 Group: System Environment/Daemons
 URL: http://ojnk.sourceforge.net/
 Source0: http://dl.sf.net/ojnk/oidentd-%{version}.tar.gz
 Source1: oidentd.init
 Source2: oidentd.sysconfig
+Patch0: oidentd-2.0.8-linux-2.6.21.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -26,7 +29,8 @@
 
 
 %prep
-%setup
+%setup -q
+%patch0 -p1 -b .masq
 
 
 %build
@@ -36,7 +40,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 %{__install} -D -p -m 0755 %{SOURCE1} \
     %{buildroot}/etc/rc.d/init.d/oidentd
 %{__install} -D -p -m 0640 %{SOURCE2} \
@@ -71,7 +75,7 @@
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog* COPYING* NEWS README TODO doc/rfc1413
 %ghost %config %{_sysconfdir}/oidentd.conf
 %ghost %config %{_sysconfdir}/oidentd_masq.conf
@@ -82,6 +86,11 @@
 
 
 %changelog
+* Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 2.0.8-3
+- Include masquerade patch fix for 2.6.21+ (#247868, Vilius Å umskas).
+- Update License field.
+- Switch to using DESTDIR install method.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 2.0.8-2
 - FC6 rebuild.
 
@@ -141,7 +150,7 @@
 
 * Tue Jan  8 2002 Matthias Saou <http://freshrpms.net/>
 - Update to 2.0.3.
-- Fix user in %files for "-".
+- Fix user in %%files for "-".
 
 * Sun Dec 30 2001 Matthias Saou <http://freshrpms.net/>
 - Update to 2.0.2.