OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-May-2006 08:40:47
Branch: HEAD Handle: 2006051607404700
Added files:
openpkg-src/dhcpd dhcpd.patch
Modified files:
openpkg-src/dhcpd dhcpd.spec
Log:
remove obsolete substitution; add a patch from the FreeBSD ports which
fixes time handling under 64-bit platforms
Summary:
Revision Changes Path
1.7 +12 -0 openpkg-src/dhcpd/dhcpd.patch
1.88 +3 -4 openpkg-src/dhcpd/dhcpd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.patch
============================================================================
$ cvs diff -u -r0 -r1.7 dhcpd.patch
--- /dev/null 2006-05-16 08:40:46 +0200
+++ dhcpd.patch 2006-05-16 08:40:47 +0200
@@ -0,0 +1,12 @@
+Index: includes/cf/freebsd.h
+--- includes/cf/freebsd.h.orig 2004-09-01 19:06:36 +0200
++++ includes/cf/freebsd.h 2006-05-16 08:37:08 +0200
+@@ -82,7 +82,7 @@
+
+ /* Time stuff... */
+ #include <sys/time.h>
+-#define TIME time_t
++#define TIME u_int32_t
+ #define GET_TIME(x) time ((x))
+
+ #define HAVE_SA_LEN
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.spec
============================================================================
$ cvs diff -u -r1.87 -r1.88 dhcpd.spec
--- openpkg-src/dhcpd/dhcpd.spec 6 May 2006 07:18:39 -0000 1.87
+++ openpkg-src/dhcpd/dhcpd.spec 16 May 2006 06:40:47 -0000 1.88
@@ -33,7 +33,7 @@
Group: DNS
License: ISC/BSD
Version: 3.0.4
-Release: 20060506
+Release: 20060516
# package options
%option with_fsl yes
@@ -43,6 +43,7 @@
Source1: dhcpd.conf
Source2: rc.dhcpd
Source3: fsl.dhcpd
+Patch0: dhcpd.patch
# build information
Prefix: %{l_prefix}
@@ -69,15 +70,13 @@
%prep
%setup -q -n dhcp-%{version}
+ %patch -p0
%{l_shtool} subst \
-e 's;^\(MANCAT.*\)[a-zA-Z0-9\.\-\/]*;\1man;' \
Makefile.conf
%{l_shtool} subst \
-e 's;nroff;true;g' \
`find . -name "Makefile.dist" -print`
- %{l_shtool} subst \
- -e 's;__u16;uint16_t;g' \
- common/tr.c
%build
# configure program
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
