OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 09-Jul-2003 15:19:13
Branch: HEAD Handle: 2003070914191102
Added files:
openpkg-src/dhcp-agent dhcp-agent.patch
Modified files:
openpkg-src/dhcp-agent dhcp-agent.spec
openpkg-web news.txt
Log:
wedge in support for linux2.2
Summary:
Revision Changes Path
1.1 +13 -0 openpkg-src/dhcp-agent/dhcp-agent.patch
1.16 +9 -2 openpkg-src/dhcp-agent/dhcp-agent.spec
1.5466 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dhcp-agent/dhcp-agent.patch
============================================================================
$ cvs diff -u -r0 -r1.1 dhcp-agent.patch
--- /dev/null 2003-07-09 15:19:13.000000000 +0200
+++ dhcp-agent.patch 2003-07-09 15:19:13.000000000 +0200
@@ -0,0 +1,13 @@
+--- src/dhcp-local.h.dist 2003-07-09 14:26:53.000000000 +0200
++++ src/dhcp-local.h 2003-07-09 14:30:19.000000000 +0200
+@@ -107,6 +107,10 @@
+ #define INADDR_NONE -1
+ #endif /* INADDR_NONE */
+
++#ifdef NEED_IN_ADDR_T
++typedef unsigned long in_addr_t;
++#endif
++
+ /* Some operating systems don't have SCNu8/SCNd8 but will have
+ * the other C99 format macros. I guess they expect us just to
+ * use normal character substitution. So we will. Otherwise
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcp-agent/dhcp-agent.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 dhcp-agent.spec
--- openpkg-src/dhcp-agent/dhcp-agent.spec 8 Jul 2003 14:39:12 -0000 1.15
+++ openpkg-src/dhcp-agent/dhcp-agent.spec 9 Jul 2003 13:19:13 -0000 1.16
@@ -33,7 +33,7 @@
Group: Converter
License: MIT-style
Version: 0.40
-Release: 20030708
+Release: 20030709
# package options
%option with_fsl yes
@@ -42,6 +42,7 @@
Source0:
http://osdn.dl.sourceforge.net/sourceforge/dhcp-agent/dhcp-agent-%{version}.tar.gz
Source1: rc.dhcp-agent
Source2: fsl.dhcp-agent
+Patch0: dhcp-agent.patch
# build information
Prefix: %{l_prefix}
@@ -64,13 +65,19 @@
%prep
%setup -q
+ %patch -p0
%{l_shtool} subst \
-e 's;mkdir -p .*\(${dhcplocalstate_clientdir}\);%{l_shtool} mkdir -p
$(DESTDIR)\1;' \
src/Makefile.in
%build
+ case "%{l_target}" in
+ *linux2.2) defs=" -DNEED_IN_ADDR_T" ;;
+ *) defs="" ;;
+ esac
+
CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
+ CFLAGS="%{l_cflags -O}$defs" \
LDFLAGS="%{l_fsl_ldflags}" \
./configure \
--prefix=%{l_prefix} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5465 -r1.5466 news.txt
--- openpkg-web/news.txt 9 Jul 2003 12:49:53 -0000 1.5465
+++ openpkg-web/news.txt 9 Jul 2003 13:19:11 -0000 1.5466
@@ -1,3 +1,4 @@
+09-Jul-2003: Upgraded package: P<dhcp-agent-0.40-20030709>
09-Jul-2003: New package: P<openpkg-rc-0.7.1-20030709>
09-Jul-2003: Upgraded package: P<ntp-4.1.1c-20030709>
09-Jul-2003: Upgraded package: P<exim-4.20-20030709>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]