OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Jul-2003 13:38:45
Branch: OPENPKG_1_STABLE HEAD Handle: 2003072812383312
Added files: (Branch: OPENPKG_1_STABLE)
openpkg-src/dhcpd fsl.dhcpd
openpkg-src/sipcalc sipcalc.patch
Modified files:
openpkg-web news.txt
Modified files: (Branch: OPENPKG_1_STABLE)
openpkg-src/dhcpd dhcpd.conf dhcpd.spec rc.dhcpd
openpkg-src/gif2png gif2png.spec
openpkg-src/iozone iozone.spec
openpkg-src/ispell ispell.spec
openpkg-src/ksh ksh.spec
openpkg-src/ncurses ncurses.spec
openpkg-src/nmap nmap.spec
openpkg-src/noweb noweb.spec
openpkg-src/openpkg HISTORY openpkg.spec rc
openpkg-src/perl-sys perl-sys.spec
openpkg-src/perl-www perl-www.spec
openpkg-src/perl-xml perl-xml.spec
openpkg-src/pgp pgp.patch pgp.spec
openpkg-src/portfwd portfwd.spec
openpkg-src/qpopper qpopper.spec
openpkg-src/sipcalc sipcalc.spec
openpkg-src/tftp tftp.patch tftp.spec
openpkg-src/vim vim.spec
Log:
MFC: all changes since last merge
Summary:
Revision Changes Path
1.1.1.1.6.2 +8 -4 openpkg-src/dhcpd/dhcpd.conf
1.32.2.6 +28 -4 openpkg-src/dhcpd/dhcpd.spec
1.1.2.1 +16 -0 openpkg-src/dhcpd/fsl.dhcpd
1.3.4.3 +1 -0 openpkg-src/dhcpd/rc.dhcpd
1.13.2.3 +2 -2 openpkg-src/gif2png/gif2png.spec
1.61.2.4 +3 -3 openpkg-src/iozone/iozone.spec
1.29.2.3 +27 -5 openpkg-src/ispell/ispell.spec
1.15.2.4 +1 -14 openpkg-src/ksh/ksh.spec
1.73.2.3 +5 -3 openpkg-src/ncurses/ncurses.spec
1.33.2.3 +7 -3 openpkg-src/nmap/nmap.spec
1.9.2.3 +6 -3 openpkg-src/noweb/noweb.spec
1.19.2.2 +1 -0 openpkg-src/openpkg/HISTORY
1.127.2.5 +2 -2 openpkg-src/openpkg/openpkg.spec
1.19.2.4 +0 -4 openpkg-src/openpkg/rc
1.21.2.4 +3 -3 openpkg-src/perl-sys/perl-sys.spec
1.45.2.5 +3 -3 openpkg-src/perl-www/perl-www.spec
1.47.2.4 +3 -3 openpkg-src/perl-xml/perl-xml.spec
1.2.2.2 +13 -1 openpkg-src/pgp/pgp.patch
1.27.2.3 +1 -1 openpkg-src/pgp/pgp.spec
1.10.2.3 +6 -2 openpkg-src/portfwd/portfwd.spec
1.36.2.6 +2 -2 openpkg-src/qpopper/qpopper.spec
1.1.2.1 +121 -0 openpkg-src/sipcalc/sipcalc.patch
1.16.2.3 +3 -1 openpkg-src/sipcalc/sipcalc.spec
1.2.2.2 +15 -0 openpkg-src/tftp/tftp.patch
1.10.2.3 +1 -2 openpkg-src/tftp/tftp.spec
1.151.2.5 +20 -2 openpkg-src/vim/vim.spec
1.5858 +18 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.conf
============================================================================
$ cvs diff -u -r1.1.1.1.6.1 -r1.1.1.1.6.2 dhcpd.conf
--- openpkg-src/dhcpd/dhcpd.conf 24 Jul 2003 20:44:00 -0000 1.1.1.1.6.1
+++ openpkg-src/dhcpd/dhcpd.conf 28 Jul 2003 11:38:34 -0000 1.1.1.1.6.2
@@ -2,7 +2,7 @@
## dhcpd.conf -- ISC DHCP Daemon Configuration
##
-# Options applicable to all subnets
+# Options applicable to all subnets
option domain-name "example.com";
authoritative;
default-lease-time 600;
@@ -15,6 +15,10 @@
option freebsd-rootopts code 130 = text;
option freebsd-swapopts code 131 = text;
+# Test drive using loopback
+subnet 127.0.0.0 netmask 255.0.0.0 {
+}
+
# Define a particular sample subnet
subnet 192.168.1.0 netmask 255.255.255.0 {
@@ -37,7 +41,7 @@
max-lease-time 86400; # 24hour
deny unknown clients;
}
-
+
# Pool of unknown clients (i.e. MAC not known)
pool {
range 192.168.1.150 192.168.1.199;
@@ -51,8 +55,8 @@
# The list of clients we explicitly configure
group {
# Just assign a fixed IP address for machine "quux1"
- host quux1 {
- hardware ethernet 01:02:03:00:00:01;
+ host quux1 {
+ hardware ethernet 01:02:03:00:00:01;
fixed-address 192.168.1.3;
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.spec
============================================================================
$ cvs diff -u -r1.32.2.5 -r1.32.2.6 dhcpd.spec
--- openpkg-src/dhcpd/dhcpd.spec 26 Jul 2003 13:36:16 -0000 1.32.2.5
+++ openpkg-src/dhcpd/dhcpd.spec 28 Jul 2003 11:38:34 -0000 1.32.2.6
@@ -33,12 +33,16 @@
Group: DNS
License: ISC/BSD
Version: 3.0.1rc11
-Release: 1.20030726
+Release: 1.20030728
+
+# package options
+%option with_fsl yes
# list of sources
Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
Source1: dhcpd.conf
Source2: rc.dhcpd
+Source3: fsl.dhcpd
Patch0: dhcpd.patch
# build information
@@ -46,6 +50,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 1.20030724
PreReq: OpenPKG, openpkg >= 1.20030724
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl >= 1.2.0
+PreReq: fsl >= 1.2.0
+%endif
AutoReq: no
AutoReqProv: no
@@ -59,6 +67,8 @@
%build
( echo 'CC = %{l_cc}'
echo 'CFLAGS = %{l_cflags -O}'
+ echo 'LDFLAGS = %{l_fsl_ldflags}'
+ echo 'LIBS = %{l_fsl_libs}'
echo 'USERBINDIR = %{l_prefix}/bin'
echo 'BINDIR = %{l_prefix}/sbin'
echo 'CLIENTBINDIR = %{l_prefix}/sbin'
@@ -91,7 +101,8 @@
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/etc/dhcpd \
$RPM_BUILD_ROOT%{l_prefix}/man/man5 \
- $RPM_BUILD_ROOT%{l_prefix}/man/man8
+ $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
%{l_shtool} install -c -m 644 \
%{SOURCE dhcpd.conf} \
@@ -103,14 +114,26 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
+ %{l_shtool} install -c -m 644 /dev/null \
+ $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd/dhcpd.leases
+
+ # install run-command script
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.dhcpd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- %{l_shtool} install -c -m 644 /dev/null \
- $RPM_BUILD_ROOT%{l_prefix}/var/dhcpd/dhcpd.leases
+
+ # install OSSP fsl configuration
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ %{SOURCE fsl.dhcpd} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+ '%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.dhcpd' \
'%config %{l_prefix}/etc/dhcpd/dhcpd.conf'
%files -f files
@@ -130,5 +153,6 @@
[ $1 -eq 0 ] || exit 0
%{l_rc} dhcpd stop 2>/dev/null
rm -f $RPM_INSTALL_PREFIX/var/dhcpd/dhcpd.log* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/dhcpd/dhcpd.leases~ >/dev/null 2>&1 || true
exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/fsl.dhcpd
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 fsl.dhcpd
--- /dev/null 2003-07-28 13:38:35.000000000 +0200
+++ fsl.dhcpd 2003-07-28 13:38:35.000000000 +0200
@@ -0,0 +1,16 @@
+##
+## fsl.dhcpd -- OSSP fsl configuration
+##
+
+ident (dhcpd.*)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/dhcpd/dhcpd.log",
+ perm=0644
+ )
+ }
+};
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/rc.dhcpd
============================================================================
$ cvs diff -u -r1.3.4.2 -r1.3.4.3 rc.dhcpd
--- openpkg-src/dhcpd/rc.dhcpd 26 Jul 2003 13:36:16 -0000 1.3.4.2
+++ openpkg-src/dhcpd/rc.dhcpd 28 Jul 2003 11:38:34 -0000 1.3.4.3
@@ -46,6 +46,7 @@
rcService dhcpd active no && exit 0
dhcpd_signal TERM
sleep 2
+ rm -f $dhcpd_pidfile 2>/dev/null || true
%restart -u @l_susr@
rcService dhcpd enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gif2png/gif2png.spec
============================================================================
$ cvs diff -u -r1.13.2.2 -r1.13.2.3 gif2png.spec
--- openpkg-src/gif2png/gif2png.spec 24 Jul 2003 20:49:36 -0000 1.13.2.2
+++ openpkg-src/gif2png/gif2png.spec 28 Jul 2003 11:38:35 -0000 1.13.2.3
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: Converter
License: GPL
-Version: 2.4.6
-Release: 1.20030724
+Version: 2.4.7
+Release: 1.20030728
# list of sources
Source0: http://www.catb.org/~esr/gif2png/gif2png-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/iozone/iozone.spec
============================================================================
$ cvs diff -u -r1.61.2.3 -r1.61.2.4 iozone.spec
--- openpkg-src/iozone/iozone.spec 26 Jul 2003 13:36:19 -0000 1.61.2.3
+++ openpkg-src/iozone/iozone.spec 28 Jul 2003 11:38:36 -0000 1.61.2.4
@@ -24,8 +24,8 @@
##
# package version
-%define V_logic 3.194
-%define V_real 3_194
+%define V_logic 3.196
+%define V_real 3_196
# package information
Name: iozone
@@ -37,7 +37,7 @@
Group: Benchmark
License: Open Source
Version: %{V_logic}
-Release: 1.20030726
+Release: 1.20030728
# list of sources
Source0: http://www.iozone.org/src/current/iozone%{V_real}.tar
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ispell/ispell.spec
============================================================================
$ cvs diff -u -r1.29.2.2 -r1.29.2.3 ispell.spec
--- openpkg-src/ispell/ispell.spec 24 Jul 2003 20:44:17 -0000 1.29.2.2
+++ openpkg-src/ispell/ispell.spec 28 Jul 2003 11:38:36 -0000 1.29.2.3
@@ -37,7 +37,7 @@
Group: Text
License: BSD
Version: %{V_ispell}
-Release: 1.20030724
+Release: 1.20030728
# list of sources
Source0: http://fmg-www.cs.ucla.edu/geoff/tars/ispell-%{V_ispell}.tar.gz
@@ -49,7 +49,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 1.20030724, make, bison
+BuildPreReq: OpenPKG, openpkg >= 1.20030724, make, bison, perl
PreReq: OpenPKG, openpkg >= 1.20030724
AutoReq: no
AutoReqProv: no
@@ -64,7 +64,11 @@
%prep
%setup -q
%patch -p0
+
+ # unpack Unix dictionary
%{l_gzip} -d -c %{SOURCE words.gz} >$RPM_BUILD_DIR/words
+
+ # unpack German dictionaries
mkdir hk-deutsch
( cd hk-deutsch
%{l_gzip} -d -c %{SOURCE hk-deutsch.tar.gz} | %{l_tar} xf -
@@ -72,6 +76,7 @@
%{l_bzip2} -d -c %{SOURCE igerman98-%{V_igerman98}.tar.bz2} | %{l_tar} xf -
%build
+ # configure package
# kludge: determine whether vendor termcap, termlib or curses library exists
# reason: some brean-dead platforms (like SuSE, etc) have no termcap library
installed.
termlib=""
@@ -98,7 +103,11 @@
esac
# echo "#define LANGUAGES
\"{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=$RPM_BUILD_DIR/words}\""
) >local.h
+
+ # build package
%{l_make} %{l_mflags}
+
+ # build additional German dictionaries
( cd hk-deutsch
cat worte.txt verben.txt \
adjektive.txt klein.txt geographie.txt vornamen.txt \
@@ -109,13 +118,19 @@
../buildhash all.words deutsch.aff deutsch.hash
) || exit $?
( cd igerman98-%{V_igerman98}
- %{l_shtool} subst -e 's;munchlist;../munchlist;g' Makefile
+ %{l_shtool} subst \
+ -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
+ bin/*.pl
+ %{l_shtool} subst \
+ -e 's;munchlist;../munchlist;g' \
+ Makefile
%{l_make} %{l_mflags} \
UNSQ=cat BUILDHASH=`pwd`/../buildhash \
german.hash 2>/dev/null
) || exit $?
%install
+ # install package
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
@@ -133,8 +148,14 @@
echo "#define WORDS \"$RPM_BUILD_DIR/words\""
# echo "#define LANGUAGES
\"{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=$RPM_BUILD_DIR/words}\""
) >local.h
- %{l_make} %{l_mflags} config.sh install-basic install-deformatters
install-dictbuild install-languages
+ %{l_make} %{l_mflags} \
+ config.sh install-basic install-deformatters install-dictbuild
install-languages
+
+ # strip down installation
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm -f $RPM_BUILD_ROOT%{l_prefix}/share/ispell/american*
+
+ # install German dictionaries
( cd hk-deutsch
%{l_shtool} install -c -m 644 \
deutsch.aff $RPM_BUILD_ROOT%{l_prefix}/share/ispell/deutsch-old.aff
@@ -147,7 +168,8 @@
%{l_shtool} install -c -m 644 \
german.hash $RPM_BUILD_ROOT%{l_prefix}/share/ispell/deutsch.hash
) || exit $?
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ksh/ksh.spec
============================================================================
$ cvs diff -u -r1.15.2.3 -r1.15.2.4 ksh.spec
--- openpkg-src/ksh/ksh.spec 26 Jul 2003 13:36:20 -0000 1.15.2.3
+++ openpkg-src/ksh/ksh.spec 28 Jul 2003 11:38:37 -0000 1.15.2.4
@@ -38,7 +38,7 @@
Group: Shell
License: AT&T
Version: %{V_pkg}
-Release: 1.20030726
+Release: 1.20030728
# list of sources
Source0: http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{V_ksh}.tgz
@@ -68,19 +68,6 @@
%setup1 -q -T -D -a 1
%build
- # the supplied Mamfiles work only for standard UNIX environment
- case "%{l_target}" in
- *solaris*)
- %{l_shtool} subst \
- -e '/^exec.*-o ksh/s/\(\${mam_libm}\)/\1 -lsecdb/' \
- src/cmd/ksh93/Mamfile
- ;;
- sparc*-linux*)
- %{l_shtool} subst \
- -e '/^exec.*-o ksh/s/\(\${mam_libm}\)/\1 -ldll/' \
- src/cmd/ksh93/Mamfile
- ;;
- esac
./bin/package "read" || true
./bin/package "make" CC="%{l_cc}"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ncurses/ncurses.spec
============================================================================
$ cvs diff -u -r1.73.2.2 -r1.73.2.3 ncurses.spec
--- openpkg-src/ncurses/ncurses.spec 24 Jul 2003 20:44:35 -0000 1.73.2.2
+++ openpkg-src/ncurses/ncurses.spec 28 Jul 2003 11:38:37 -0000 1.73.2.3
@@ -54,8 +54,9 @@
%define V_patch26 20030705
%define V_patch27 20030712
%define V_patch28 20030719
-%define V_patchL %{V_patch28}
-%define V_patches 28
+%define V_patch29 20030726
+%define V_patchL %{V_patch29}
+%define V_patches 29
# package information
Name: ncurses
@@ -67,7 +68,7 @@
Group: Terminal
License: GPL
Version: %{V_base}.%{V_patchL}
-Release: 1.20030724
+Release: 1.20030728
# list of sources
Source0: ftp://invisible-island.net/ncurses/ncurses-%{V_base}.tar.gz
@@ -100,6 +101,7 @@
Patch26:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch26}.patch.gz
Patch27:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch27}.patch.gz
Patch28:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch28}.patch.gz
+Patch29:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch29}.patch.gz
# build information
Prefix: %{l_prefix}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nmap/nmap.spec
============================================================================
$ cvs diff -u -r1.33.2.2 -r1.33.2.3 nmap.spec
--- openpkg-src/nmap/nmap.spec 24 Jul 2003 20:44:37 -0000 1.33.2.2
+++ openpkg-src/nmap/nmap.spec 28 Jul 2003 11:38:38 -0000 1.33.2.3
@@ -33,7 +33,7 @@
Group: Network
License: GPL
Version: 3.30
-Release: 1.20030724
+Release: 1.20030728
# list of sources
Source0: http://www.insecure.org/nmap/dist/nmap-%{version}.tgz
@@ -64,10 +64,14 @@
configure */configure
%build
+ cppflags=""
+ case "%{l_target}" in
+ *-solaris2.6 ) cppflags="-D_XPG4_2" ;;
+ esac
CC="%{l_cc}" \
CXX="%{l_cxx}" \
- CFLAGS="%{l_cflags -O}" \
- CXXFLAGS="%{l_cxxflags -O}" \
+ CFLAGS="%{l_cflags -O} $cppflags" \
+ CXXFLAGS="%{l_cxxflags -O} $cppflags" \
./configure \
--prefix=%{l_prefix} \
--without-nmapfe
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/noweb/noweb.spec
============================================================================
$ cvs diff -u -r1.9.2.2 -r1.9.2.3 noweb.spec
--- openpkg-src/noweb/noweb.spec 24 Jul 2003 20:50:12 -0000 1.9.2.2
+++ openpkg-src/noweb/noweb.spec 28 Jul 2003 11:38:39 -0000 1.9.2.3
@@ -33,7 +33,7 @@
Group: Text
License: GPL
Version: 2.10c
-Release: 1.20030724
+Release: 1.20030728
# list of sources
Source0: ftp://ftp.eecs.harvard.edu/pub/nr/noweb-%{version}.tgz
@@ -69,7 +69,8 @@
BIN=%{l_prefix}/bin \
MAN=%{l_prefix}/man \
LIB=%{l_prefix}/share/noweb \
- TEXINPUTS=%{l_prefix}/share/noweb/tex
+ TEXINPUTS=%{l_prefix}/share/noweb/tex \
+ ELISP=%{l_prefix}/share/noweb/elisp
%install
rm -rf $RPM_BUILD_ROOT
@@ -86,8 +87,10 @@
BIN=$RPM_BUILD_ROOT%{l_prefix}/bin \
MAN=$RPM_BUILD_ROOT%{l_prefix}/man \
LIB=$RPM_BUILD_ROOT%{l_prefix}/share/noweb \
- TEXINPUTS=$RPM_BUILD_ROOT%{l_prefix}/share/noweb/tex
+ TEXINPUTS=$RPM_BUILD_ROOT%{l_prefix}/share/noweb/tex \
+ ELISP=$RPM_BUILD_ROOT%{l_prefix}/share/noweb/elisp
cd ..
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/noweb/elisp
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
( cd $RPM_BUILD_ROOT%{l_prefix}
%{l_shtool} subst \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.19.2.1 -r1.19.2.2 HISTORY
--- openpkg-src/openpkg/HISTORY 24 Jul 2003 20:41:59 -0000 1.19.2.1
+++ openpkg-src/openpkg/HISTORY 28 Jul 2003 11:38:39 -0000 1.19.2.2
@@ -2,6 +2,7 @@
2003
====
+20030727 rc: do not export TMPDIR at all, it causes problems for applications once
the directory is gone
20030721 rc: do not use TMPDIR -- instead use hard-coded /tmp
20030719 openpkg.boot: try to make build environment more sane by setting umask and
unsetting some strange aliases
20030718 rc.func: opXXX replaced by rcXXX; add rc(8) manual page; add pod2man.sh;
fix perl/ warnings under building
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.127.2.4 -r1.127.2.5 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 24 Jul 2003 20:41:59 -0000 1.127.2.4
+++ openpkg-src/openpkg/openpkg.spec 28 Jul 2003 11:38:39 -0000 1.127.2.5
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 1.20030724
+%define V_openpkg 1.20030728
# the used software versions
%define V_rpm 4.0.2
@@ -63,7 +63,7 @@
Group: Bootstrapping
License: GPL
Version: %{V_openpkg}
-Release: 1.20030724
+Release: %{V_openpkg}
# list of sources
Source0: README
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.19.2.3 -r1.19.2.4 rc
--- openpkg-src/openpkg/rc 24 Jul 2003 20:41:59 -0000 1.19.2.3
+++ openpkg-src/openpkg/rc 28 Jul 2003 11:38:39 -0000 1.19.2.4
@@ -139,9 +139,6 @@
exit 1
fi
declare -r tmpdir
-TMPDIR_ORIG="$TMPDIR"
-TMPDIR="$tmpdir"
-export TMPDIR
trap "trap - EXIT INT ABRT QUIT TERM; rm -rf $tmpdir >/dev/null 2>&1 || true" EXIT
INT ABRT QUIT TERM
# determine reasonable temporary files
@@ -587,7 +584,6 @@
MANPATH="$MANPATH" \
INFOPATH="$INFOPATH" \
LD_LIBRARY_PATH="$LD_LIBRARY_PATH" \
- TMPDIR="$TMPDIR_ORIG" \
$bash --norc --noprofile --posix \
$tmpfile >$outfile 2>/dev/null
cp $outfile $tmpfile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-sys/perl-sys.spec
============================================================================
$ cvs diff -u -r1.21.2.3 -r1.21.2.4 perl-sys.spec
--- openpkg-src/perl-sys/perl-sys.spec 24 Jul 2003 20:44:53 -0000
1.21.2.3
+++ openpkg-src/perl-sys/perl-sys.spec 28 Jul 2003 11:38:40 -0000
1.21.2.4
@@ -25,7 +25,7 @@
# versions of individual parts
%define V_unix_syslog 0.99
-%define V_archive_tar 1.03
+%define V_archive_tar 1.04
%define V_expect 1.15
%define V_storable 2.07
%define V_ipc_shareable 0.60
@@ -43,8 +43,8 @@
Distribution: OpenPKG [BASE]
Group: Language
License: GPL/Artistic
-Version: 1.20030724
-Release: 1.20030724
+Version: 1.20030728
+Release: 1.20030728
# list of sources
Source0:
http://www.cpan.org/modules/by-module/Unix/Unix-Syslog-%{V_unix_syslog}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-www/perl-www.spec
============================================================================
$ cvs diff -u -r1.45.2.4 -r1.45.2.5 perl-www.spec
--- openpkg-src/perl-www/perl-www.spec 26 Jul 2003 13:36:21 -0000
1.45.2.4
+++ openpkg-src/perl-www/perl-www.spec 28 Jul 2003 11:38:41 -0000
1.45.2.5
@@ -32,7 +32,7 @@
%define V_cgi_formmagick 0.89
%define V_cgi_minimal 1.10
%define V_cgi_safe 1.24
-%define V_cgi_session 3.94
+%define V_cgi_session 3.95
%define V_fcgi 0.67
%define V_rpc_xml 0.53
%define V_soap_lite 0.55
@@ -48,8 +48,8 @@
Distribution: OpenPKG [BASE]
Group: Language
License: GPL/Artistic
-Version: 1.20030726
-Release: 1.20030726
+Version: 1.20030728
+Release: 1.20030728
# list of sources
Source0: http://www.cpan.org/modules/by-module/URI/URI-%{V_uri}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-xml/perl-xml.spec
============================================================================
$ cvs diff -u -r1.47.2.3 -r1.47.2.4 perl-xml.spec
--- openpkg-src/perl-xml/perl-xml.spec 24 Jul 2003 20:44:57 -0000
1.47.2.3
+++ openpkg-src/perl-xml/perl-xml.spec 28 Jul 2003 11:38:41 -0000
1.47.2.4
@@ -24,7 +24,7 @@
##
# versions of individual parts
-%define V_xml_parser 2.31
+%define V_xml_parser 2.32
%define V_xml_libxml_common 0.13
%define V_xml_libxml 1.54_4
%define V_xml_libxslt 1.53
@@ -62,8 +62,8 @@
Distribution: OpenPKG [BASE]
Group: Language
License: GPL/Artistic
-Version: 1.20030724
-Release: 1.20030724
+Version: 1.20030728
+Release: 1.20030728
# package options
%option with_libxml no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pgp/pgp.patch
============================================================================
$ cvs diff -u -r1.2.2.1 -r1.2.2.2 pgp.patch
--- openpkg-src/pgp/pgp.patch 24 Jul 2003 20:44:58 -0000 1.2.2.1
+++ openpkg-src/pgp/pgp.patch 28 Jul 2003 11:38:42 -0000 1.2.2.2
@@ -464,7 +464,7 @@
--- libs/pgpcdk/unix/ui/PGPKeyServerDialogs.cpp.orig Tue Mar 9 18:52:17 1999
+++ libs/pgpcdk/unix/ui/PGPKeyServerDialogs.cpp Fri Sep 29 20:51:02 2000
@@ -5,6 +5,7 @@
- $Id: pgp.patch,v 1.2 2003/07/24 09:22:10 mlelstv Exp $
+ $Id: pgp.patch,v 1.3 2003/07/28 08:43:33 rse Exp $
____________________________________________________________________________*/
#include <string.h>
+#include <stdlib.h>
@@ -554,3 +554,15 @@
return( err );
}
+--- libs/pfl/common/lthread/pgpThreads.h.orig Mon Apr 19 19:59:53 1999
++++ libs/pfl/common/lthread/pgpThreads.h Mon Jul 28 10:29:14 2003
+@@ -148,6 +148,9 @@
+ #ifdef PGP_UNIX_HPUX
+ #include <semaphore.h>
+ typedef sem_t PGPSem_t; /* not a struct under HP-UX 10.20 */
++#elif defined(__FreeBSD__)
++#include <semaphore.h>
++typedef sem_t PGPSem_t;
+ #else
+ typedef struct sem_t PGPSem_t;
+ #endif /* !PGP_UNIX_HPUX */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pgp/pgp.spec
============================================================================
$ cvs diff -u -r1.27.2.2 -r1.27.2.3 pgp.spec
--- openpkg-src/pgp/pgp.spec 24 Jul 2003 20:44:58 -0000 1.27.2.2
+++ openpkg-src/pgp/pgp.spec 28 Jul 2003 11:38:42 -0000 1.27.2.3
@@ -38,7 +38,7 @@
Group: Cryptography
License: GPL
Version: %{V_long}
-Release: 1.20030724
+Release: 1.20030728
# list of sources
Source0:
ftp://ftp.pgpi.org/pub/pgp/%{V_short}/%{V_long}/pgpsrc%{V_strip}unix.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/portfwd/portfwd.spec
============================================================================
$ cvs diff -u -r1.10.2.2 -r1.10.2.3 portfwd.spec
--- openpkg-src/portfwd/portfwd.spec 24 Jul 2003 20:50:24 -0000 1.10.2.2
+++ openpkg-src/portfwd/portfwd.spec 28 Jul 2003 11:38:42 -0000 1.10.2.3
@@ -33,7 +33,7 @@
Group: Network
License: GPL
Version: 0.26rc6
-Release: 1.20030724
+Release: 1.20030728
# package options
%option with_fsl yes
@@ -84,11 +84,15 @@
%build
# configure package
+ cppflags=""
+ case "%{l_target}" in
+ *-solaris2.6 ) cppflags="-Dsocklen_t=int" ;;
+ esac
CC="%{l_cc}" \
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
CXXFLAGS="%{l_cxxflags -O}" \
- CPPFLAGS="%{l_cppflags}" \
+ CPPFLAGS="%{l_cppflags} $cppflags" \
LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
LIBS="%{l_fsl_libs}" \
./configure \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/qpopper/qpopper.spec
============================================================================
$ cvs diff -u -r1.36.2.5 -r1.36.2.6 qpopper.spec
--- openpkg-src/qpopper/qpopper.spec 24 Jul 2003 20:45:13 -0000 1.36.2.5
+++ openpkg-src/qpopper/qpopper.spec 28 Jul 2003 11:38:43 -0000 1.36.2.6
@@ -33,7 +33,7 @@
Group: Mail
License: GPL
Version: 4.0.5
-Release: 1.20030724
+Release: 1.20030728
# package options
%option with_fsl yes
@@ -93,7 +93,6 @@
%if "%{with_pam}" == "yes"
--with-pam=qpopper \
%endif
- --enable-home-dir-mail=.mail/inbox \
%if "%{with_fsl}" == "yes"
--with-log-facility=LOG_USER \
%else
@@ -119,6 +118,7 @@
# install qpopper
%{l_shtool} install -c -m 644 \
+ -e 's;^# \(set home-dir-mail[^=]*=\).*;\1 ".mail/inbox";' \
samples/qpopper.config $RPM_BUILD_ROOT%{l_prefix}/etc/qpopper/
%{l_shtool} install -c -s -m 755 \
popper/popper $RPM_BUILD_ROOT%{l_prefix}/sbin/qpopper
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sipcalc/sipcalc.patch
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 sipcalc.patch
--- /dev/null 2003-07-28 13:38:44.000000000 +0200
+++ sipcalc.patch 2003-07-28 13:38:44.000000000 +0200
@@ -0,0 +1,121 @@
+--- src/sub-func.c.orig 2003-03-19 13:28:15.000000000 +0100
++++ src/sub-func.c 2003-07-28 10:35:53.000000000 +0200
+@@ -1267,7 +1267,7 @@
+ }
+ #endif
+
+-#if defined(HAVE_GETHOSTBYNAME2) && defined(HAVE_INET_NTOP)
++#if defined(HAVE_GETHOSTBYNAME2) && defined(HAVE_INET_NTOP) && defined(AF_INET6)
+ char *
+ _resolv_v6_ghbn2 (char *raddr, struct dnsresp *d_resp, char *extra)
+ {
+@@ -1308,7 +1308,7 @@
+ }
+ #endif
+
+-#if defined(HAVE_GETADDRINFO) && defined(HAVE_INET_NTOP)
++#if defined(HAVE_GETADDRINFO) && defined(HAVE_INET_NTOP) && defined(AF_INET6)
+ char *
+ _resolv_v6_gai (char *raddr, struct dnsresp *d_resp, char *extra)
+ {
+@@ -1393,13 +1393,19 @@
+ snprintf(d_resp->str, 127, "%s%s", inet_ntoa (sin->sin_addr),
extra);
+ d_resp->type = AF_INET;
+ }
++#ifdef AF_INET6
+ if (res->ai_family == PF_INET6) {
+ sin6 = (struct sockaddr_in6 *) res->ai_addr;
+ snprintf (retaddr, 1023, "%s%s", inet_ntop (AF_INET6,
&sin6->sin6_addr, ip6addr, 128), extra);
+ snprintf (d_resp->str, 127, "%s%s", inet_ntop (AF_INET6,
&sin6->sin6_addr, ip6addr, 128), extra);
+ d_resp->type = AF_INET6;
+ }
++#endif
++#ifdef AF_INET6
+ if (res->ai_next && (res->ai_family == PF_INET || res->ai_family ==
PF_INET6))
++#else
++ if (res->ai_next && res->ai_family == PF_INET)
++#endif
+ d_resp = new_dnsresp (d_resp);
+ res = res->ai_next;
+ }
+@@ -1460,14 +1466,20 @@
+ if ((f_gethostbyname2 || f_getaddrinfo) && f_inet_ntop)
+ ipv6_cap = 1;
+
++#ifdef AF_INET6
+ if (family != PF_INET && family != PF_INET6 && family != PF_UNSPEC)
++#else
++ if (family != PF_INET && family != PF_UNSPEC)
++#endif
+ return NULL;
+
+ if (family == PF_INET && !ipv4_cap)
+ return NULL;
+
++#ifdef AF_INET6
+ if (family == PF_INET6 && !ipv6_cap)
+ return NULL;
++#endif
+
+ if (family == PF_UNSPEC && (!ipv4_cap && !ipv6_cap))
+ return NULL;
+@@ -1475,8 +1487,10 @@
+ if (strlen (addr) > 1023)
+ return NULL;
+
++#ifdef AF_INET6
+ if (family == PF_UNSPEC && !ipv4_cap)
+ family = PF_INET6;
++#endif
+
+ if (family == PF_UNSPEC && !ipv6_cap)
+ family = PF_INET;
+@@ -1508,6 +1522,7 @@
+ return retaddr;
+ }
+
++#ifdef AF_INET6
+ if (family == PF_INET6) {
+ if (f_getaddrinfo) {
+ tmpstr = _resolv_v6_gai (raddr, d_resp, extra);
+@@ -1525,6 +1540,7 @@
+ return retaddr;
+ }
+ }
++#endif
+
+ if (family == PF_UNSPEC) {
+ if (f_getaddrinfo) {
+--- src/sub.c.orig 2003-03-19 13:28:16.000000000 +0100
++++ src/sub.c 2003-07-28 10:37:10.000000000 +0200
+@@ -496,6 +496,7 @@
+ ifarg_cur->type = IFT_V6;
+ }
+
++#if AF_INET6
+ if (abox->type == AT_V6 && abox->resolv) {
+ d_resp_start = d_resp_cur = (struct dnsresp *) malloc (sizeof
(struct dnsresp));
+ d_resp_start->next = NULL;
+@@ -526,6 +527,7 @@
+
+ free_dnsresp (d_resp_start);
+ }
++#endif
+
+ if (abox->type == AT_INT) {
+ if_cur = if_start;
+@@ -585,12 +587,14 @@
+ d_resp_cur = d_resp_start;
+ while (d_resp_cur) {
+ strncpy (ifarg_cur->cmdstr, abox->str, 127);
++#if AF_INET6
+ if (d_resp_cur->type == AF_INET6) {
+ strncpy (ifarg_cur->p_v6addr,
d_resp_cur->str, 43);
+ ifarg_cur->type = IFT_V6;
+
+ mk_ipv6addr (&ifarg_cur->v6ad,
ifarg_cur->p_v6addr);
+ }
++#endif
+ if (d_resp_cur->type == AF_INET) {
+ tmpstr = strstr (d_resp_cur->str, " ");
+ if (tmpstr != NULL && (strlen (tmpstr)
> 0)) {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sipcalc/sipcalc.spec
============================================================================
$ cvs diff -u -r1.16.2.2 -r1.16.2.3 sipcalc.spec
--- openpkg-src/sipcalc/sipcalc.spec 24 Jul 2003 20:50:39 -0000 1.16.2.2
+++ openpkg-src/sipcalc/sipcalc.spec 28 Jul 2003 11:38:44 -0000 1.16.2.3
@@ -33,10 +33,11 @@
Group: Network
License: GPL
Version: 1.1.2
-Release: 1.20030724
+Release: 1.20030728
# list of sources
Source0:
http://www.routemeister.net/projects/sipcalc/files/sipcalc-%{version}.tar.gz
+Patch0: sipcalc.patch
# build information
Prefix: %{l_prefix}
@@ -51,6 +52,7 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tftp/tftp.patch
============================================================================
$ cvs diff -u -r1.2.2.1 -r1.2.2.2 tftp.patch
--- openpkg-src/tftp/tftp.patch 24 Jul 2003 20:50:48 -0000 1.2.2.1
+++ openpkg-src/tftp/tftp.patch 28 Jul 2003 11:38:44 -0000 1.2.2.2
@@ -66,3 +66,18 @@
+--- Makefile.dist 2003-07-28 09:32:28.000000000 +0200
++++ Makefile 2003-07-28 09:34:55.000000000 +0200
+@@ -54,9 +54,9 @@
+ # Adding "configure" to the dependencies serializes this with running
+ # autoconf, because there are apparently race conditions between
+ # autoconf and autoheader.
+-acconfig.h.in: configure.in configure aclocal.m4
+- rm -f acconfig.h.in acconfig.h
+- autoheader
++#acconfig.h.in: configure.in configure aclocal.m4
++# rm -f acconfig.h.in acconfig.h
++# autoheader
+
+ configure: configure.in aclocal.m4
+ rm -f MCONFIG configure config.log acconfig.h config.cache
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tftp/tftp.spec
============================================================================
$ cvs diff -u -r1.10.2.2 -r1.10.2.3 tftp.spec
--- openpkg-src/tftp/tftp.spec 24 Jul 2003 20:50:48 -0000 1.10.2.2
+++ openpkg-src/tftp/tftp.spec 28 Jul 2003 11:38:44 -0000 1.10.2.3
@@ -33,7 +33,7 @@
Group: Networtk
License: GPL
Version: 0.34
-Release: 1.20030724
+Release: 1.20030728
# package options
%option with_fsl yes
@@ -64,7 +64,6 @@
%prep
%setup -q -n tftp-hpa-%{version}
%patch -p0
- touch acconfig.h.in
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vim/vim.spec
============================================================================
$ cvs diff -u -r1.151.2.4 -r1.151.2.5 vim.spec
--- openpkg-src/vim/vim.spec 26 Jul 2003 13:36:24 -0000 1.151.2.4
+++ openpkg-src/vim/vim.spec 28 Jul 2003 11:38:45 -0000 1.151.2.5
@@ -26,7 +26,7 @@
# package versions
%define V_vl 6.2
%define V_vs 62
-%define V_pl 38
+%define V_pl 56
# package information
Name: vim
@@ -38,7 +38,7 @@
Group: Editor
License: Charityware
Version: %{V_vl}.%{V_pl}
-Release: 1.20030726
+Release: 1.20030728
# package options
%option with_x11 no
@@ -91,6 +91,24 @@
Patch36: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.036
Patch37: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.037
Patch38: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.038
+Patch39: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.039
+Patch40: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.040
+Patch41: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.041
+Patch42: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.042
+Patch43: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.043
+Patch44: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.044
+Patch45: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.045
+Patch46: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.046
+Patch47: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.047
+Patch48: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.048
+Patch49: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.049
+Patch50: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.050
+Patch51: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.051
+Patch52: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.052
+Patch53: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.053
+Patch54: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.054
+Patch55: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.055
+Patch56: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.056
# build information
Prefix: %{l_prefix}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5857 -r1.5858 news.txt
--- openpkg-web/news.txt 28 Jul 2003 11:18:00 -0000 1.5857
+++ openpkg-web/news.txt 28 Jul 2003 11:38:33 -0000 1.5858
@@ -1,3 +1,21 @@
+28-Jul-2003: Upgraded package: P<vim-6.2.56-1.20030728>
+28-Jul-2003: Upgraded package: P<tftp-0.34-1.20030728>
+28-Jul-2003: Upgraded package: P<sipcalc-1.1.2-1.20030728>
+28-Jul-2003: Upgraded package: P<qpopper-4.0.5-1.20030728>
+28-Jul-2003: Upgraded package: P<portfwd-0.26rc6-1.20030728>
+28-Jul-2003: Upgraded package: P<pgp-6.5.8-1.20030728>
+28-Jul-2003: Upgraded package: P<perl-xml-1.20030728-1.20030728>
+28-Jul-2003: Upgraded package: P<perl-www-1.20030728-1.20030728>
+28-Jul-2003: Upgraded package: P<perl-sys-1.20030728-1.20030728>
+28-Jul-2003: Upgraded package: P<openpkg-1.20030728-1.20030728>
+28-Jul-2003: Upgraded package: P<noweb-2.10c-1.20030728>
+28-Jul-2003: Upgraded package: P<nmap-3.30-1.20030728>
+28-Jul-2003: Upgraded package: P<ncurses-5.3.20030726-1.20030728>
+28-Jul-2003: Upgraded package: P<ksh-20030724-1.20030728>
+28-Jul-2003: Upgraded package: P<ispell-3.2.06-1.20030728>
+28-Jul-2003: Upgraded package: P<iozone-3.196-1.20030728>
+28-Jul-2003: Upgraded package: P<gif2png-2.4.7-1.20030728>
+28-Jul-2003: Upgraded package: P<dhcpd-3.0.1rc11-1.20030728>
28-Jul-2003: Upgraded package: P<nmap-3.30-20030728>
28-Jul-2003: Upgraded package: P<portfwd-0.26rc6-20030728>
28-Jul-2003: Upgraded package: P<ksh-20030724-20030728>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
