|
|
@@ -25,7 +25,7 @@
|
|
|
|
|
|
%define V_build stable
|
|
|
%define V_release 2.3.2
|
|
|
-%define V_stable 20020203
|
|
|
+%define V_stable 20020306
|
|
|
|
|
|
# package information
|
|
|
Name: inn
|
|
|
@@ -41,7 +41,7 @@ Version: %{V_release}
|
|
|
%else
|
|
|
Version: %{V_release}.%{V_stable}
|
|
|
%endif
|
|
|
-Release: 20020206
|
|
|
+Release: 20020306
|
|
|
|
|
|
# list of sources
|
|
|
Source0: ftp://ftp.openpkg.org/DST/inn/fakesyslog.tar.gz
|
|
|
@@ -52,7 +52,7 @@ Source3: rc.inn
|
|
|
# build information
|
|
|
Prefix: %{l_prefix}
|
|
|
BuildRoot: %{l_buildroot}
|
|
|
-BuildPreReq: OpenPKG, openpkg >= 20020206, make, perl, db, openssl, bison, flex
|
|
|
+BuildPreReq: OpenPKG, openpkg >= 20020206, make, perl, db3, openssl, bison, flex
|
|
|
PreReq: OpenPKG, openpkg >= 20020206, perl, MTA
|
|
|
AutoReq: no
|
|
|
AutoReqProv: no
|
|
|
@@ -98,11 +98,15 @@ AutoReqProv: no
|
|
|
%{l_shtool} subst \
|
|
|
-e "s;^\\(pathbin:.*\\)@prefix@.*;\\1@prefix@/libexec/inn;" \
|
|
|
samples/inn.conf.in
|
|
|
+ %{l_shtool} subst \
|
|
|
+ -e "s;BERKELEY_DB_DIR/include;BERKELEY_DB_DIR/include/db3;" \
|
|
|
+ -e "s;-ldb;-ldb3;" \
|
|
|
+ configure
|
|
|
|
|
|
# configure the source tree
|
|
|
CC="%{l_cc}" \
|
|
|
- CFLAGS="%{l_cflags -O}" \
|
|
|
- LDFLAGS="-L$fakesyslogdir" \
|
|
|
+ CFLAGS="%{l_cflags -O} -I%{l_prefix}/include/db3 -I%{l_prefix}/include" \
|
|
|
+ LDFLAGS="-L$fakesyslogdir -L%{l_prefix}/lib" \
|
|
|
LIBS="-lfakesyslog" \
|
|
|
./configure \
|
|
|
--prefix=%{l_prefix} \
|
|
|
@@ -139,9 +143,9 @@ AutoReqProv: no
|
|
|
|
|
|
# determine current user and group
|
|
|
thisuser=`(id -un) 2>/dev/null ||\
|
|
|
- (whoami) 2>/dev/null ||\
|
|
|
- (who am i | cut "-d " -f1) 2>/dev/null ||\
|
|
|
- echo $LOGNAME`
|
|
|
+ (whoami) 2>/dev/null ||\
|
|
|
+ (who am i | cut "-d " -f1) 2>/dev/null ||\
|
|
|
+ echo $LOGNAME`
|
|
|
thisgroup=`(cat /etc/passwd; ypcat passwd) 2>/dev/null |\
|
|
|
grep "^${thisuser}:" | awk -F: '{ print $4; }' | head -1`
|
|
|
thisgroup=`(cat /etc/group; ypcat group) 2>/dev/null |\
|
