rpms/ipxripd/devel ipxripd-0.7-gcc3.patch, NONE, 1.1 ipxripd-0.7-kernel2.6.patch, NONE, 1.1 ipxripd-0.8-glibc2.1.patch, NONE, 1.1 ipxripd.init, NONE, 1.1 ipxripd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Dmitry Butskoy (buc)
fedora-extras-commits at redhat.com
Tue Dec 13 11:43:47 UTC 2005
Author: buc
Update of /cvs/extras/rpms/ipxripd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8447/devel
Modified Files:
.cvsignore sources
Added Files:
ipxripd-0.7-gcc3.patch ipxripd-0.7-kernel2.6.patch
ipxripd-0.8-glibc2.1.patch ipxripd.init ipxripd.spec
Log Message:
auto-import ipxripd-0.8-2 on branch devel from ipxripd-0.8-2.src.rpm
ipxripd-0.7-gcc3.patch:
--- NEW FILE ipxripd-0.7-gcc3.patch ---
diff -Nrbu ipxripd/ipxd.c ipxripd.OK/ipxd.c
--- ipxripd/ipxd.c 2004-08-03 15:36:01.000000000 +0400
+++ ipxripd.OK/ipxd.c 2004-08-03 15:35:33.000000000 +0400
@@ -19,6 +19,7 @@
*/
+#include <stdlib.h>
#include <signal.h>
#include <unistd.h>
#include <string.h>
diff -Nrbu ipxripd/ipxd.h ipxripd.OK/ipxd.h
--- ipxripd/ipxd.h 1996-02-08 19:07:56.000000000 +0300
+++ ipxripd.OK/ipxd.h 2004-08-03 15:34:42.000000000 +0400
@@ -23,6 +23,7 @@
#define _IPXD_H_
#include <stdio.h>
+#include <time.h>
#include <sys/time.h>
#include "ipxutil.h"
#include "ipxkern.h"
@@ -55,7 +56,7 @@
extern FILE *log_file;
extern int passive;
-extern int check_request;
+extern volatile int check_request;
struct ipx_interface *first_interface(void);
struct ipx_interface *next_interface(struct ipx_interface *ifc);
ipxripd-0.7-kernel2.6.patch:
--- NEW FILE ipxripd-0.7-kernel2.6.patch ---
diff -Nrbu ipxripd/ipxkern.c ipxripd-OK/ipxkern.c
--- ipxripd/ipxkern.c 1996-02-01 19:56:07.000000000 +0300
+++ ipxripd-OK/ipxkern.c 2005-03-10 18:09:53.215272940 +0300
@@ -51,7 +51,9 @@
FILE *ipx_route;
char buf[512];
- ipx_route = fopen("/proc/net/ipx_route", "r");
+ ipx_route = fopen("/proc/net/ipx/route", "r");
+ if (!ipx_route)
+ ipx_route = fopen("/proc/net/ipx_route", "r"); /* old kernels */
if (ipx_route == NULL)
{
@@ -109,7 +111,9 @@
FILE *ipx_ifc;
char buf[512];
- ipx_ifc = fopen("/proc/net/ipx_interface", "r");
+ ipx_ifc = fopen("/proc/net/ipx/interface", "r");
+ if (!ipx_ifc)
+ ipx_ifc = fopen("/proc/net/ipx_interface", "r"); /*old kernels*/
if (ipx_ifc == NULL)
{
ipxripd-0.8-glibc2.1.patch:
--- NEW FILE ipxripd-0.8-glibc2.1.patch ---
diff -Nrbu ipxripd-0.8/ipxd.c ipxripd-0.8-OK/ipxd.c
--- ipxripd-0.8/ipxd.c 2001-07-01 01:07:34.000000000 +0400
+++ ipxripd-0.8-OK/ipxd.c 2005-10-13 16:19:25.000000000 +0400
@@ -333,8 +333,6 @@
struct itimerval itval;
int i;
- log_file=stderr;
-
LOG_ENTRY;
LOG_START;
fprintf(log_file,"Init start\n");
@@ -717,6 +715,7 @@
int
main(int argc,char** argv)
{
+ log_file = stderr;
if (parse_cmdline(argc,argv))
{
daemonize();
diff -Nrbu ipxripd-0.8/ipxripd.c ipxripd-0.8-OK/ipxripd.c
--- ipxripd-0.8/ipxripd.c 2001-07-01 01:07:34.000000000 +0400
+++ ipxripd-0.8-OK/ipxripd.c 2005-10-13 16:18:07.000000000 +0400
@@ -39,7 +39,6 @@
#include <string.h>
#include <sys/socket.h>
#include <netinet/in.h>
-#include <linux/ipx.h>
#include "ipxutil.h"
#include "ipxkern.h"
#include "ipxrip.h"
diff -Nrbu ipxripd-0.8/ipxsapd.c ipxripd-0.8-OK/ipxsapd.c
--- ipxripd-0.8/ipxsapd.c 2001-07-01 01:07:34.000000000 +0400
+++ ipxripd-0.8-OK/ipxsapd.c 2005-10-13 16:18:07.000000000 +0400
@@ -32,7 +32,6 @@
#include <errno.h>
#include <sys/socket.h>
#include <netinet/in.h>
-#include <linux/ipx.h>
#include "ipxutil.h"
#include "ipxkern.h"
#include "ipxsap.h"
diff -Nrbu ipxripd-0.8/ipxutil.h ipxripd-0.8-OK/ipxutil.h
--- ipxripd-0.8/ipxutil.h 1996-02-01 19:58:48.000000000 +0300
+++ ipxripd-0.8-OK/ipxutil.h 2005-10-13 16:18:07.000000000 +0400
@@ -25,7 +25,7 @@
#define __IPXUTIL_H__
#include <stdio.h>
-#include <linux/ipx.h>
+#include <netipx/ipx.h>
#define IPX_MAX_ERROR (255)
#define IPX_THIS_NET (0)
--- NEW FILE ipxripd.init ---
#! /bin/sh
# chkconfig: - 55 55
# description: ipxripd is an implementation of Novell's RIP and SAP
# protocols.
# processname: ipxd
# Source function library.
. /etc/rc.d/init.d/functions
# Get config.
. /etc/sysconfig/network
# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0
# See how we were called.
case "$1" in
start)
echo -n "Starting ipxd services: "
daemon ipxd
[ $? -eq 0 ] && touch /var/lock/subsys/ipxd
echo
;;
stop)
echo -n "Stopping ipxd services: "
killproc ipxd
rm -f /var/lock/subsys/ipxd
echo
;;
status)
status ipxd
;;
restart|reload)
$0 stop
$0 start
;;
condrestart)
[ -f /var/lock/subsys/ipxd ] && $0 restart
;;
*)
echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
exit 1
esac
exit 0
--- NEW FILE ipxripd.spec ---
Summary: IPX RIP/SAP daemon - routing for IPX networks
Name: ipxripd
Version: 0.8
Release: 2%{?dist}
Group: System Environment/Daemons
License: GPL
URL: ftp://ftp.ibiblio.org/pub/Linux/system/filesystems/ncpfs/
Source0: ftp://ftp.ibiblio.org/pub/Linux/system/filesystems/ncpfs/ipxripd-%{version}.tar.gz
Source1: ipxripd.init
Patch0: ipxripd-0.8-glibc2.1.patch
Patch1: ipxripd-0.7-gcc3.patch
Patch2: ipxripd-0.7-kernel2.6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig, /sbin/service
Requires(postun): /sbin/service
%description
%{name} is an implementation of Novell's RIP and SAP protocols.
It automagically builds and updates IPX routing table in the Linux kernel.
%{name} can be useful to get a Linux box to act as an IPX router.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_sbindir}
install -m755 ipxd $RPM_BUILD_ROOT%{_sbindir}
install -d $RPM_BUILD_ROOT%{_mandir}/man8
install -d $RPM_BUILD_ROOT%{_mandir}/man5
install -p ipxd.8 $RPM_BUILD_ROOT%{_mandir}/man8
install -p ipx_ticks.5 $RPM_BUILD_ROOT%{_mandir}/man5
install -d $RPM_BUILD_ROOT%{_initrddir}
install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ipxd
%post
/sbin/chkconfig --add ipxd
%preun
if [ $1 = 0 ]; then
/sbin/service ipxd stop >/dev/null 2>&1
/sbin/chkconfig --del ipxd
fi
%postun
if [ $1 != 0 ]; then
/sbin/service ipxd condrestart >/dev/null 2>&1
fi
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc COPYING README ipx_ticks ipxripd-*.lsm
%{_sbindir}/*
%{_initrddir}/*
%{_mandir}/*/*
%changelog
* Tue Dec 13 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.8-2
- spec file cleanups
- accepted for Fedora Extra (review by John Mahowald <jpmahowald at gmail.com>)
* Thu Oct 13 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.8-1
- upgrade to 0.8
- cleanups of initrd script
* Thu Mar 10 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.7-1
- add patch for kernel >= 2.6
* Tue Aug 3 2004 Dmitry Butskoy <Dmitry at Butskoy.name>
- replace old patches by new one from PLD distribution (common "glibc2.1.patch")
- add gcc3 compilation patch to build on Fedora Core 1
* Tue Dec 14 1999 Joerg Dorchain <joerg at dorchain.net>
- added init script
* Wed Jul 8 1998 Andrzej K. Brandt <andy at mnich.ml.org>
- First version of the RPM package
- Added a quick and dirty hack to this thing to compile under glibc
I tested it and it works fine
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipxripd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Dec 2005 11:42:46 -0000 1.1
+++ .cvsignore 13 Dec 2005 11:43:45 -0000 1.2
@@ -0,0 +1 @@
+ipxripd-0.8.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipxripd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Dec 2005 11:42:46 -0000 1.1
+++ sources 13 Dec 2005 11:43:45 -0000 1.2
@@ -0,0 +1 @@
+decd5c1eb2c763e25c7a2db3c385cdf0 ipxripd-0.8.tar.gz
More information about the fedora-extras-commits
mailing list