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: 26-Jul-2003 15:36:24
Branch: OPENPKG_1_STABLE HEAD Handle: 2003072614361212
Added files: (Branch: OPENPKG_1_STABLE)
openpkg-src/bash bash.patch
Modified files:
openpkg-web news.txt
Modified files: (Branch: OPENPKG_1_STABLE)
openpkg-src/bash bash.spec profile
openpkg-src/bind bind.spec
openpkg-src/coreutils coreutils.spec
openpkg-src/dhcpd dhcpd.spec rc.dhcpd
openpkg-src/doxygen doxygen.spec
openpkg-src/dsh dsh.spec
openpkg-src/fsl fsl.spec
openpkg-src/gmime gmime.spec
openpkg-src/iozone iozone.spec
openpkg-src/ircd ircd.conf ircd.spec rc.ircd
openpkg-src/ksh ksh.spec
openpkg-src/openldap openldap.spec
openpkg-src/patchutils patchutils.spec
openpkg-src/perl-www perl-www.spec
openpkg-src/postgresql postgresql.spec
openpkg-src/smtpfeed rc.smtpfeed smtpfeed.spec
openpkg-src/uucp rc.uucp uucp.spec
openpkg-src/vim vim.spec
Log:
MFC: all changes since last merge
Summary:
Revision Changes Path
1.2.2.1 +150 -0 openpkg-src/bash/bash.patch
1.31.2.3 +25 -10 openpkg-src/bash/bash.spec
1.5.2.2 +2 -2 openpkg-src/bash/profile
1.37.2.6 +5 -2 openpkg-src/bind/bind.spec
1.9.2.3 +7 -1 openpkg-src/coreutils/coreutils.spec
1.32.2.5 +1 -1 openpkg-src/dhcpd/dhcpd.spec
1.3.4.2 +11 -1 openpkg-src/dhcpd/rc.dhcpd
1.21.2.3 +2 -2 openpkg-src/doxygen/doxygen.spec
1.10.2.3 +2 -2 openpkg-src/dsh/dsh.spec
1.31.2.6 +6 -1 openpkg-src/fsl/fsl.spec
1.14.2.3 +2 -2 openpkg-src/gmime/gmime.spec
1.61.2.3 +3 -3 openpkg-src/iozone/iozone.spec
1.3.6.1 +2 -2 openpkg-src/ircd/ircd.conf
1.28.2.3 +1 -3 openpkg-src/ircd/ircd.spec
1.3.4.2 +2 -1 openpkg-src/ircd/rc.ircd
1.15.2.3 +4 -4 openpkg-src/ksh/ksh.spec
1.48.2.3 +6 -1 openpkg-src/openldap/openldap.spec
1.23.2.3 +2 -2 openpkg-src/patchutils/patchutils.spec
1.45.2.4 +3 -3 openpkg-src/perl-www/perl-www.spec
1.31.2.5 +2 -2 openpkg-src/postgresql/postgresql.spec
1.8.4.2 +7 -4 openpkg-src/smtpfeed/rc.smtpfeed
1.36.2.6 +2 -1 openpkg-src/smtpfeed/smtpfeed.spec
1.3.4.2 +9 -3 openpkg-src/uucp/rc.uucp
1.25.2.3 +4 -8 openpkg-src/uucp/uucp.spec
1.151.2.4 +9 -2 openpkg-src/vim/vim.spec
1.5830 +18 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bash/bash.patch
============================================================================
$ cvs diff -u -r0 -r1.2.2.1 bash.patch
--- /dev/null 2003-07-26 15:36:14.000000000 +0200
+++ bash.patch 2003-07-26 15:36:14.000000000 +0200
@@ -0,0 +1,150 @@
+This patch makes sure Bash does not segfault on empty here documents. It
+is derived from Gentoo Linux. The problem can be reproduced with "xargs
+<<< ${EMTPY_VARIABLE}".
+
+--- redir.c 2002-03-12 20:27:38.000000000 +0000
++++ redir.c 2003-05-01 13:04:07.000000000 +0100
+@@ -263,8 +263,10 @@
+ int herelen, n, e;
+
+ herestr = expand_string_to_string (redirectee->word, 0);
+- herelen = strlen (herestr);
+
++ /* verify string wasnt empty */
++ herelen = (herestr == NULL) ? 0 : strlen (herestr);
++
+ n = write (fd, herestr, herelen);
+ if (n == herelen)
+ {
+
+-----------------------------------------------------------------------------
+
+This patch documents two implemented and classical command line options
+"-v" and "-v". It is derived from Debian GNU/Linux.
+
+--- doc/bash.1 Wed Jan 20 22:48:04 1999
++++ doc/bash.1 Sun Nov 14 13:26:59 1999
+@@ -104,6 +104,12 @@
+ This option allows the positional parameters to be set
+ when invoking an interactive shell.
+ .TP
++.B \-v
++Print shell input lines as they are read.
++.TP
++.B \-x
++Print commands and their arguments as they are executed.
++.TP
+ .B \-D
+ A list of all double-quoted strings preceded by \fB$\fP
+ is printed on the standard ouput.
+
+-----------------------------------------------------------------------------
+
+This patch makes sure Bash does not segfault on on "shift" under "shopt
+-s shift_verbose". It is a null pointer dereference caused by an
+erroneous assumption that, when the number of arguments to shift exceeds
+the number of arguments available for shifting, the latter is always
+explicitly specified on the command line rather than left implicit at
+the default 1. The patch was derived from Debian GNU/Linux.
+
+--- builtins/shift.def.orig 2002-10-22 01:05:10.000000000 -0400
++++ builtins/shift.def 2002-10-22 01:05:06.000000000 -0400
+@@ -68,7 +68,7 @@
+ else if (times > number_of_args ())
+ {
+ if (print_shift_error)
+- sh_erange (list->word->word, "shift count");
++ sh_erange (list ? list->word->word : NULL, "shift count");
+ return (EXECUTION_FAILURE);
+ }
+
+
+-----------------------------------------------------------------------------
+
+This patch makes sure a signal state variable is declared "volatile" so
+it is consistent throughout signal handling. This patch is derived from
+SuSE Linux.
+
+--- quit.h
++++ quit.h Wed May 2 17:38:34 2001
+@@ -21,8 +21,8 @@
+ #if !defined (_QUIT_H_)
+ #define _QUIT_H_
+
+ /* Non-zero means SIGINT has already ocurred. */
+-extern int interrupt_state;
++extern volatile int interrupt_state;
+
+ /* Macro to call a great deal. SIGINT just sets above variable. When
+ it is safe, put QUIT in the code, and the "interrupt" will take place. */
+--- sig.c
++++ sig.c Wed May 2 17:36:17 2001
+@@ -57,7 +57,7 @@
+ extern int interactive, interactive_shell, login_shell, startup_state;
+
+ /* Non-zero after SIGINT. */
+-int interrupt_state;
++volatile int interrupt_state = 0;
+
+ /* The environment at the top-level R-E loop. We use this in
+ the case of error return. */
+@@ -69,7 +69,7 @@
+ #endif /* JOB_CONTROL */
+
+ /* When non-zero, we throw_to_top_level (). */
+-int interrupt_immediately = 0;
++volatile int interrupt_immediately = 0;
+
+ static void initialize_shell_signals ();
+
+-----------------------------------------------------------------------------
+
+This patch adds an explicit recognition for terminal sequence "kD" to be
+"Delete" key. This is derived from Debian GNU/Linux and SuSE Linux.
+
+--- lib/readline/terminal.c
++++ lib/readline/terminal.c Thu Jul 18 14:34:00 2002
+@@ -145,6 +145,9 @@
+ static char *_rl_term_kH;
+ static char *_rl_term_at7; /* @7 */
+
++/* The key sequence sent by the Delete key, if any. */
++static char *_rl_term_kD;
++
+ /* Insert key */
+ static char *_rl_term_kI;
+
+@@ -313,6 +316,7 @@
+ { "ei", &_rl_term_ei },
+ { "ic", &_rl_term_ic },
+ { "im", &_rl_term_im },
++ { "kD", &_rl_term_kD }, /* delete */
+ { "kH", &_rl_term_kH }, /* home down ?? */
+ { "kI", &_rl_term_kI }, /* insert */
+ { "kd", &_rl_term_kd },
+@@ -496,6 +500,7 @@
+
+ _rl_bind_if_unbound (_rl_term_kh, rl_beg_of_line); /* Home */
+ _rl_bind_if_unbound (_rl_term_at7, rl_end_of_line); /* End */
++ _rl_bind_if_unbound (_rl_term_kD, rl_delete); /* Delete */
+
+ _rl_keymap = xkeymap;
+ }
+
+-----------------------------------------------------------------------------
+
+This patch makes sure Bash does not segfault on a particular error.
+It is derived from RedHat Linux.
+
+--- builtins/common.c.warnings 2003-03-25 17:48:02.000000000 +0000
++++ builtins/common.c 2003-03-25 17:49:03.000000000 +0000
+@@ -244,7 +244,7 @@
+ char *s;
+ {
+ if (s)
+- builtin_error ("%s: no job control");
++ builtin_error ("%s: no job control", s);
+ else
+ builtin_error ("no job control");
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bash/bash.spec
============================================================================
$ cvs diff -u -r1.31.2.2 -r1.31.2.3 bash.spec
--- openpkg-src/bash/bash.spec 24 Jul 2003 20:41:50 -0000 1.31.2.2
+++ openpkg-src/bash/bash.spec 26 Jul 2003 13:36:14 -0000 1.31.2.3
@@ -37,18 +37,19 @@
Group: Shell
License: GPL
Version: %{V_real}
-Release: 1.20030724
+Release: 1.20030726
# list of sources
Source0: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}.tar.gz
Source1: profile
-Patch0: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}-patches/bash%{V_comp}-001
-Patch1: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}-patches/bash%{V_comp}-002
-Patch2: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}-patches/bash%{V_comp}-003
-Patch3: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}-patches/bash%{V_comp}-004
-Patch4: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}-patches/bash%{V_comp}-005
-Patch5: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}-patches/bash%{V_comp}-006
-Patch6: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}-patches/bash%{V_comp}-007
+Patch0: bash.patch
+Patch1: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}-patches/bash%{V_comp}-001
+Patch2: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}-patches/bash%{V_comp}-002
+Patch3: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}-patches/bash%{V_comp}-003
+Patch4: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}-patches/bash%{V_comp}-004
+Patch5: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}-patches/bash%{V_comp}-005
+Patch6: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}-patches/bash%{V_comp}-006
+Patch7: ftp://ftp.cwru.edu/pub/bash/bash-%{V_real}-patches/bash%{V_comp}-007
# build information
Prefix: %{l_prefix}
@@ -74,8 +75,10 @@
%patch4 -p0
%patch5 -p0
%patch6 -p0
+ %patch7 -p0
%build
+ # configure package
( # force disabled wide-character support
echo "ac_cv_header_wchar_h=no"
echo "ac_cv_header_wctype_h=no"
@@ -100,18 +103,29 @@
%{l_shtool} subst \
-e 's;/etc/profile;%{l_prefix}/etc/bash/profile;' \
doc/bash.1
+
+ # build package
%{l_make} %{l_mflags}
%install
+ # install package
rm -rf $RPM_BUILD_ROOT
- %{l_make} %{l_mflags} install prefix=$RPM_BUILD_ROOT%{l_prefix}
+ %{l_make} %{l_mflags} install \
+ prefix=$RPM_BUILD_ROOT%{l_prefix}
+
+ # strip down installation
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/bashbug.1
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/bashbug
strip $RPM_BUILD_ROOT%{l_prefix}/bin/bash
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/bash
+
+ # install global configuration
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/bash
%{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE profile} $RPM_BUILD_ROOT%{l_prefix}/etc/bash/
+
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%config %{l_prefix}/etc/bash/profile'
@@ -123,6 +137,7 @@
%post
if [ ".$1" = .1 ]; then
+ # display note about login shell prerequisite
if [ -f /etc/shells ]; then
if [ ".`grep $RPM_INSTALL_PREFIX/bin/bash /etc/shells`" = . ]; then
( echo "Hint: To use $RPM_INSTALL_PREFIX/bin/bash as the login"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bash/profile
============================================================================
$ cvs diff -u -r1.5.2.1 -r1.5.2.2 profile
--- openpkg-src/bash/profile 24 Jul 2003 20:41:50 -0000 1.5.2.1
+++ openpkg-src/bash/profile 26 Jul 2003 13:36:14 -0000 1.5.2.2
@@ -1,5 +1,5 @@
##
-## @l_prefix@/etc/bash/profile -- Global Bash Profile
+## @l_prefix@/etc/bash/profile -- Global GNU Bash Profile
##
# welcome and goodbye message ;)
@@ -90,7 +90,7 @@
fi
}
-# suck in the Bourne-Shell environment of all OpenPKG packages
+# load the Bourne-Shell environment of all installed OpenPKG packages
eval [EMAIL PROTECTED]@/etc/rc --eval all env`
# path to user environment init script
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bind/bind.spec
============================================================================
$ cvs diff -u -r1.37.2.5 -r1.37.2.6 bind.spec
--- openpkg-src/bind/bind.spec 25 Jul 2003 09:18:37 -0000 1.37.2.5
+++ openpkg-src/bind/bind.spec 26 Jul 2003 13:36:14 -0000 1.37.2.6
@@ -37,7 +37,7 @@
Group: DNS
License: ISC
Version: %{V_bind}
-Release: 1.20030725
+Release: 1.20030726
# package options
%option with_dlz_mysql no
@@ -107,7 +107,10 @@
%{l_patch} -p1 <dlz.patch
# fix up DLZ link libraries for MySQL and PostgreSQL
%{l_shtool} subst \
- -e '/-lmysqlclient/s;-l\(nsl\|z\|crypt\|m\)\( \|"\);\2;g' \
+ -e '/-lmysqlclient/s;-lnsl\([ "]\);\1;g' \
+ -e '/-lmysqlclient/s;-lz\([ "]\);\1;g' \
+ -e '/-lmysqlclient/s;-lcrypt\([ "]\);\1;g' \
+ -e '/-lmysqlclient/s;-lm\([ "]\);\1;g' \
-e 's;\(-lpq\);\1 -lssl -lcrypto -lcrypt;g' \
-e 's;\(\$use_dlz_postgres/include\);\1/postgresql;g' \
configure
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/coreutils/coreutils.spec
============================================================================
$ cvs diff -u -r1.9.2.2 -r1.9.2.3 coreutils.spec
--- openpkg-src/coreutils/coreutils.spec 24 Jul 2003 20:43:55 -0000 1.9.2.2
+++ openpkg-src/coreutils/coreutils.spec 26 Jul 2003 13:36:15 -0000 1.9.2.3
@@ -33,7 +33,7 @@
Group: Utility
License: GPL
Version: 5.0.1
-Release: 1.20030724
+Release: 1.20030726
# package options
%option with_legacy no
@@ -92,6 +92,12 @@
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm -f "$RPM_BUILD_ROOT%{l_prefix}/bin/g["
+ # rename gpr utility to avoid conflict with graphviz
+ # legacyname becomes nupr
+ mv "$RPM_BUILD_ROOT%{l_prefix}/bin/gpr" \
+ "$RPM_BUILD_ROOT%{l_prefix}/bin/gnupr" 2>/dev/null || true
+ mv "$RPM_BUILD_ROOT%{l_prefix}/man/man1/gpr.1" \
+ "$RPM_BUILD_ROOT%{l_prefix}/man/man1/gnupr.1" 2>/dev/null || true
%if "%{with_legacy}" == "yes"
( cd $RPM_BUILD_ROOT%{l_prefix}/bin
for i in g*; do
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/dhcpd.spec
============================================================================
$ cvs diff -u -r1.32.2.4 -r1.32.2.5 dhcpd.spec
--- openpkg-src/dhcpd/dhcpd.spec 24 Jul 2003 20:44:00 -0000 1.32.2.4
+++ openpkg-src/dhcpd/dhcpd.spec 26 Jul 2003 13:36:16 -0000 1.32.2.5
@@ -33,7 +33,7 @@
Group: DNS
License: ISC/BSD
Version: 3.0.1rc11
-Release: 1.20030724
+Release: 1.20030726
# list of sources
Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcpd/rc.dhcpd
============================================================================
$ cvs diff -u -r1.3.4.1 -r1.3.4.2 rc.dhcpd
--- openpkg-src/dhcpd/rc.dhcpd 24 Jul 2003 20:44:00 -0000 1.3.4.1
+++ openpkg-src/dhcpd/rc.dhcpd 26 Jul 2003 13:36:16 -0000 1.3.4.2
@@ -5,6 +5,9 @@
%config
dhcpd_enable="$openpkg_rc_def"
+ dhcpd_flags="-q"
+ dhcpd_if=""
+ dhcpd_port="67"
dhcpd_log_prolog="true"
dhcpd_log_epilog="true"
dhcpd_log_numfiles="10"
@@ -20,6 +23,7 @@
%status -u @l_susr@ -o
dhcpd_usable="unknown"
dhcpd_active="no"
+ [ ".$dhcpd_if" = . ] && dhcpd_usable="no"
rcService dhcpd enable yes && \
dhcpd_signal 0 && dhcpd_active="yes"
echo "dhcpd_enable=\"$dhcpd_enable\""
@@ -28,8 +32,14 @@
%start -u @l_susr@
rcService dhcpd enable yes || exit 0
+ rcService dhcpd usable no && exit 0
rcService dhcpd active yes && exit 0
- @l_prefix@/sbin/dhcpd >/dev/null 2>&1
+ flags="$dhcpd_flags"
+ echo $flags | grep -- -p >/dev/null
+ if [ $? -ne 0 -a ".$dhcpd_port" != . ]; then
+ flags="$flags -p $dhcpd_port"
+ fi
+ @l_prefix@/sbin/dhcpd $flags $dhcpd_if >/dev/null 2>&1
%stop -u @l_susr@
rcService dhcpd enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/doxygen/doxygen.spec
============================================================================
$ cvs diff -u -r1.21.2.2 -r1.21.2.3 doxygen.spec
--- openpkg-src/doxygen/doxygen.spec 24 Jul 2003 20:49:27 -0000 1.21.2.2
+++ openpkg-src/doxygen/doxygen.spec 26 Jul 2003 13:36:16 -0000 1.21.2.3
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: Text
License: GPL
-Version: 1.3.2
-Release: 1.20030724
+Version: 1.3.3
+Release: 1.20030726
# list of sources
Source0: ftp://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dsh/dsh.spec
============================================================================
$ cvs diff -u -r1.10.2.2 -r1.10.2.3 dsh.spec
--- openpkg-src/dsh/dsh.spec 24 Jul 2003 20:49:27 -0000 1.10.2.2
+++ openpkg-src/dsh/dsh.spec 26 Jul 2003 13:36:17 -0000 1.10.2.3
@@ -24,7 +24,7 @@
##
# package versions
-%define V_dsh 0.23.11
+%define V_dsh 0.23.12
%define V_dshconfig 0.20.8
# package information
@@ -37,7 +37,7 @@
Group: Shell
License: GPL
Version: %{V_dsh}
-Release: 1.20030724
+Release: 1.20030726
# list of sources
Source0:
http://www.netfort.gr.jp/~dancer/software/downloads/dsh-%{V_dsh}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/fsl/fsl.spec
============================================================================
$ cvs diff -u -r1.31.2.5 -r1.31.2.6 fsl.spec
--- openpkg-src/fsl/fsl.spec 24 Jul 2003 20:41:54 -0000 1.31.2.5
+++ openpkg-src/fsl/fsl.spec 26 Jul 2003 13:36:18 -0000 1.31.2.6
@@ -33,7 +33,7 @@
Group: System
License: MIT-style
Version: 1.2.0
-Release: 1.20030724
+Release: 1.20030726
# package options
%option with_fsl_debuglogcode no
@@ -63,6 +63,11 @@
%prep
%setup -q
+ %{l_shtool} subst \
+ -e 's;pcre;fsl_pcre;g' \
+ -e '/#include/s;fsl_pcre;pcre;g' \
+ *.[ch] \
+ lib_pcre/*.[ch]
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gmime/gmime.spec
============================================================================
$ cvs diff -u -r1.14.2.2 -r1.14.2.3 gmime.spec
--- openpkg-src/gmime/gmime.spec 24 Jul 2003 20:49:39 -0000 1.14.2.2
+++ openpkg-src/gmime/gmime.spec 26 Jul 2003 13:36:18 -0000 1.14.2.3
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: Converter
License: GPL
-Version: 2.0.8
-Release: 1.20030724
+Version: 2.0.9
+Release: 1.20030726
# list of sources
Source0: http://spruce.sourceforge.net/gmime/sources/gmime-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/iozone/iozone.spec
============================================================================
$ cvs diff -u -r1.61.2.2 -r1.61.2.3 iozone.spec
--- openpkg-src/iozone/iozone.spec 24 Jul 2003 20:49:49 -0000 1.61.2.2
+++ openpkg-src/iozone/iozone.spec 26 Jul 2003 13:36:19 -0000 1.61.2.3
@@ -24,8 +24,8 @@
##
# package version
-%define V_logic 3.191
-%define V_real 3_191
+%define V_logic 3.194
+%define V_real 3_194
# package information
Name: iozone
@@ -37,7 +37,7 @@
Group: Benchmark
License: Open Source
Version: %{V_logic}
-Release: 1.20030724
+Release: 1.20030726
# list of sources
Source0: http://www.iozone.org/src/current/iozone%{V_real}.tar
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ircd/ircd.conf
============================================================================
$ cvs diff -u -r1.3 -r1.3.6.1 ircd.conf
--- openpkg-src/ircd/ircd.conf 18 Oct 2001 15:09:00 -0000 1.3
+++ openpkg-src/ircd/ircd.conf 26 Jul 2003 13:36:19 -0000 1.3.6.1
@@ -8,7 +8,7 @@
# Administrative Information
# A;<Your Name/Location>;<Your Electronic Mailing Addr>;<other information>;;
-A;OpenPKG Sample IRC Server;John Doe Admin <[EMAIL PROTECTED]>;Client Server;;
+A;OpenPKG Sample IRC Server;John Doe Admin <[EMAIL PROTECTED]>;Client Server;;
# Port Connections
# P;<YOUR Internet IP#>;<*>;<Internet IP Mask>;<Port>;
@@ -29,5 +29,5 @@
# Bounce Server
# B;<Class|Host Mask>;;<Server Name>;<Port>;
-#B;;;irc2.foo.dom;6667;
+#B;;;irc2.example.com;6667;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ircd/ircd.spec
============================================================================
$ cvs diff -u -r1.28.2.2 -r1.28.2.3 ircd.spec
--- openpkg-src/ircd/ircd.spec 24 Jul 2003 20:44:15 -0000 1.28.2.2
+++ openpkg-src/ircd/ircd.spec 26 Jul 2003 13:36:19 -0000 1.28.2.3
@@ -33,7 +33,7 @@
Group: Network
License: BSD
Version: 2.10.3p3
-Release: 1.20030724
+Release: 1.20030726
# package options
%option with_fsl yes
@@ -117,8 +117,6 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/ircd/ircd.motd
%{l_shtool} install -c -m 644 /dev/null \
$RPM_BUILD_ROOT%{l_prefix}/etc/ircd/ircd.tune
- %{l_shtool} install -c -m 644 /dev/null \
- $RPM_BUILD_ROOT%{l_prefix}/var/ircd/ircd.log
rm -rf $RPM_BUILD_ROOT%{l_prefix}/bin
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/irc.1
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* 2>/dev/null || true
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ircd/rc.ircd
============================================================================
$ cvs diff -u -r1.3.4.1 -r1.3.4.2 rc.ircd
--- openpkg-src/ircd/rc.ircd 24 Jul 2003 20:44:16 -0000 1.3.4.1
+++ openpkg-src/ircd/rc.ircd 26 Jul 2003 13:36:19 -0000 1.3.4.2
@@ -29,13 +29,14 @@
%start -u @l_susr@
rcService ircd enable yes || exit 0
rcService ircd active yes && exit 0
- @l_prefix@/sbin/ircd
+ @l_prefix@/sbin/ircd -c
%stop -u @l_susr@
rcService ircd enable yes || exit 0
rcService ircd active no && exit 0
ircd_signal TERM
sleep 2
+ rm -f $ircd_pidfile 2>/dev/null || true
%restart -u @l_susr@
rcService ircd enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ksh/ksh.spec
============================================================================
$ cvs diff -u -r1.15.2.2 -r1.15.2.3 ksh.spec
--- openpkg-src/ksh/ksh.spec 24 Jul 2003 20:44:20 -0000 1.15.2.2
+++ openpkg-src/ksh/ksh.spec 26 Jul 2003 13:36:20 -0000 1.15.2.3
@@ -24,9 +24,9 @@
##
# package versions
-%define V_pkg 20030621
-%define V_ksh 2003-06-21
-%define V_init 2003-06-21
+%define V_pkg 20030724
+%define V_ksh 2003-07-24
+%define V_init 2003-07-24
# package information
Name: ksh
@@ -38,7 +38,7 @@
Group: Shell
License: AT&T
Version: %{V_pkg}
-Release: 1.20030724
+Release: 1.20030726
# list of sources
Source0: http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{V_ksh}.tgz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.48.2.2 -r1.48.2.3 openldap.spec
--- openpkg-src/openldap/openldap.spec 24 Jul 2003 20:44:38 -0000
1.48.2.2
+++ openpkg-src/openldap/openldap.spec 26 Jul 2003 13:36:20 -0000
1.48.2.3
@@ -33,7 +33,7 @@
Group: Database
License: GPL
Version: 2.1.22
-Release: 1.20030724
+Release: 1.20030726
# package options
%option with_fsl yes
@@ -122,6 +122,11 @@
%{l_shtool} subst \
-e '/\$OpenLDAP: .*slapd\.conf,v/d' \
$RPM_BUILD_ROOT%{l_prefix}/etc/openldap/slapd.conf
+
+ # remove fsl dependency from libtool files
+ %{l_shtool} subst \
+ -e 's;-lfsl *;;' \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
# install run-command script
%{l_shtool} mkdir -f -p -m 755 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/patchutils/patchutils.spec
============================================================================
$ cvs diff -u -r1.23.2.2 -r1.23.2.3 patchutils.spec
--- openpkg-src/patchutils/patchutils.spec 24 Jul 2003 20:50:18 -0000
1.23.2.2
+++ openpkg-src/patchutils/patchutils.spec 26 Jul 2003 13:36:21 -0000
1.23.2.3
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: Converter
License: GPL
-Version: 0.2.23
-Release: 1.20030724
+Version: 0.2.24
+Release: 1.20030726
# list of sources
Source0:
http://cyberelk.net/tim/data/patchutils/stable/patchutils-%{version}.tar.bz2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-www/perl-www.spec
============================================================================
$ cvs diff -u -r1.45.2.3 -r1.45.2.4 perl-www.spec
--- openpkg-src/perl-www/perl-www.spec 24 Jul 2003 20:44:56 -0000
1.45.2.3
+++ openpkg-src/perl-www/perl-www.spec 26 Jul 2003 13:36:21 -0000
1.45.2.4
@@ -25,7 +25,7 @@
# versions of individual parts
%define V_libwww_perl 5.69
-%define V_uri 1.23
+%define V_uri 1.24
%define V_cgi 2.98
%define V_cgi_application 3.1
%define V_cgi_formbuilder 2.11
@@ -48,8 +48,8 @@
Distribution: OpenPKG [BASE]
Group: Language
License: GPL/Artistic
-Version: 1.20030724
-Release: 1.20030724
+Version: 1.20030726
+Release: 1.20030726
# list of sources
Source0: http://www.cpan.org/modules/by-module/URI/URI-%{V_uri}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql/postgresql.spec
============================================================================
$ cvs diff -u -r1.31.2.4 -r1.31.2.5 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec 24 Jul 2003 20:45:06 -0000
1.31.2.4
+++ openpkg-src/postgresql/postgresql.spec 26 Jul 2003 13:36:22 -0000
1.31.2.5
@@ -24,7 +24,7 @@
##
# package versions
-%define V_postgresql 7.3.3
+%define V_postgresql 7.3.4
%define V_libpqpp 4.0
%define V_libpqxx 1.5.1
%define V_pgperl 2.0.2
@@ -40,7 +40,7 @@
Group: Database
License: GPL
Version: %{V_postgresql}
-Release: 1.20030724
+Release: 1.20030726
# package options
%option with_cxx no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/smtpfeed/rc.smtpfeed
============================================================================
$ cvs diff -u -r1.8.4.1 -r1.8.4.2 rc.smtpfeed
--- openpkg-src/smtpfeed/rc.smtpfeed 24 Jul 2003 20:45:22 -0000 1.8.4.1
+++ openpkg-src/smtpfeed/rc.smtpfeed 26 Jul 2003 13:36:23 -0000 1.8.4.2
@@ -6,8 +6,10 @@
%config
smtpfeed_enable="$openpkg_rc_def"
smtpfeed_flags="-u -V"
- smtpfeed_bind_local="127.0.0.1:2525"
- smtpfeed_bind_remote="0.0.0.0"
+ smtpfeed_bind="127.0.0.1"
+ smtpfeed_port="2525"
+ smtpfeed_source_addr=""
+ smtpfeed_source_port=""
smtpfeed_hostname="localhost"
smtpfeed_timeout_connect="1m"
smtpfeed_timeout_greet="2m"
@@ -26,7 +28,8 @@
smtpfeed_args="$smtpfeed_args -t connect=${smtpfeed_timeout_connect:-1m}"
smtpfeed_args="$smtpfeed_args -t greet=${smtpfeed_timeout_greet:-2m}"
smtpfeed_args="$smtpfeed_args -t rset=${smtpfeed_timeout_rset:-2m}"
- smtpfeed_args="$smtpfeed_args -o ${smtpfeed_bind_remote:-0.0.0.0}"
+ smtpfeed_args="$smtpfeed_args ${smtpfeed_source_addr:+-o
}${smtpfeed_source_addr}"
+ smtpfeed_args="$smtpfeed_args ${smtpfeed_source_port:+-p
}${smtpfeed_source_port}"
smtpfeed_args="$smtpfeed_args -c ${smtpfeed_hostname:-localhost}"
smtpfeed_args="$smtpfeed_args -r 1 -R ${smtpfeed_maxrcpt:-100}"
smtpfeed_args="$smtpfeed_args -s ${smtpfeed_maxsize:-4194304}"
@@ -34,7 +37,7 @@
[ -f $smtpfeed_pidfile ] && kill -$1 `cat $smtpfeed_pidfile`
}
smtpfeed_start () {
- ( @l_prefix@/sbin/smtpfeedd ${smtpfeed_bind_local:-127.0.0.1:2525} \
+ ( @l_prefix@/sbin/smtpfeedd
${smtpfeed_bind}${smtpfeed_bind:+:}${smtpfeed_port:-2525} \
@l_prefix@/sbin/smtpfeed ${smtpfeed_args} \
</dev/null >/dev/null 2>&1 &
echo "$!" >${smtpfeed_pidfile}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/smtpfeed/smtpfeed.spec
============================================================================
$ cvs diff -u -r1.36.2.5 -r1.36.2.6 smtpfeed.spec
--- openpkg-src/smtpfeed/smtpfeed.spec 25 Jul 2003 09:18:40 -0000
1.36.2.5
+++ openpkg-src/smtpfeed/smtpfeed.spec 26 Jul 2003 13:36:23 -0000
1.36.2.6
@@ -33,7 +33,7 @@
Group: Mail
License: GPL
Version: 1.18
-Release: 1.20030725
+Release: 1.20030726
# package options
%option with_fsl yes
@@ -65,6 +65,7 @@
%prep
%setup0 -q -c
%setup1 -q -T -D -a 1
+ %{l_shtool} subst -e 's/port program \[argv0 argv1/port argv0 \[argv1 argv2/'
smtpfeedd/smtpfeedd.c
%{l_shtool} subst \
-e 's;5\.8;5.[89];g' \
smtpfeed-%{version}/configure
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/uucp/rc.uucp
============================================================================
$ cvs diff -u -r1.3.4.1 -r1.3.4.2 rc.uucp
--- openpkg-src/uucp/rc.uucp 24 Jul 2003 20:45:34 -0000 1.3.4.1
+++ openpkg-src/uucp/rc.uucp 26 Jul 2003 13:36:23 -0000 1.3.4.2
@@ -5,6 +5,9 @@
%config
uucp_enable="$openpkg_rc_def"
+ uucp_flags="-l"
+ uucp_bind="127.0.0.1"
+ uucp_port="540"
uucp_log_prolog="true"
uucp_log_epilog="true"
uucp_log_numfiles="10"
@@ -17,7 +20,8 @@
[ -f $uucp_pidfile ] && kill -$1 `cat $uucp_pidfile`
}
uucp_start () {
- ( @l_prefix@/sbin/uucpd uucp @l_prefix@/sbin/uucico -l \
+ ( @l_prefix@/sbin/uucpd ${uucp_bind}${uucp_bind:+:}${uucp_port:-uucp} \
+ @l_prefix@/sbin/uucico ${uucp_flags} \
</dev/null >/dev/null 2>&1 &
echo "$!" >$uucp_pidfile
) </dev/null >/dev/null 2>&1
@@ -55,8 +59,10 @@
# rotate logfile
shtool rotate -f \
-n ${uucp_log_numfiles} -s ${uucp_log_minsize} -d \
- -z ${uucp_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+ -z ${uucp_log_complevel} -m 644 -o @l_musr@ -g @l_mgrp@ \
-P "${uucp_log_prolog}" \
-E "${uucp_log_epilog} && rc uucp restart" \
- @l_prefix@/var/uucp/uucp.log
+ @l_prefix@/var/uucp/log/uucp.debug \
+ @l_prefix@/var/uucp/log/uucp.log \
+ @l_prefix@/var/uucp/log/uucp.stat
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/uucp/uucp.spec
============================================================================
$ cvs diff -u -r1.25.2.2 -r1.25.2.3 uucp.spec
--- openpkg-src/uucp/uucp.spec 24 Jul 2003 20:45:34 -0000 1.25.2.2
+++ openpkg-src/uucp/uucp.spec 26 Jul 2003 13:36:23 -0000 1.25.2.3
@@ -33,7 +33,7 @@
Group: Communication
License: GPL
Version: 1.07
-Release: 1.20030724
+Release: 1.20030726
# list of sources
Source0: ftp://ftp.gnu.org/gnu/uucp/uucp-%{version}.tar.gz
@@ -66,6 +66,7 @@
-e 's;chgrp;true;g' \
`find . -name Makefile.in -print`
) || exit $?
+ %{l_shtool} subst -e 's/port program \[argv0 argv1/port argv0 \[argv1 argv2/'
uucpd/uucpd.c
%build
( cd uucp-%{version}
@@ -109,12 +110,6 @@
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.uucp} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- %{l_shtool} install -c -m 644 /dev/null \
- $RPM_BUILD_ROOT%{l_prefix}/var/uucp/log/uucp.log
- %{l_shtool} install -c -m 644 /dev/null \
- $RPM_BUILD_ROOT%{l_prefix}/var/uucp/log/uucp.stat
- %{l_shtool} install -c -m 644 /dev/null \
- $RPM_BUILD_ROOT%{l_prefix}/var/uucp/log/uucp.debug
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* 2>/dev/null || true
@@ -138,6 +133,7 @@
# before erase, stop service and remove log files
[ $1 -eq 0 ] || exit 0
%{l_rc} uucp stop 2>/dev/null
- rm -f $RPM_INSTALL_PREFIX/var/uucp/uucp.log* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/uucp/log/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/uucp/run/* >/dev/null 2>&1 || true
exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vim/vim.spec
============================================================================
$ cvs diff -u -r1.151.2.3 -r1.151.2.4 vim.spec
--- openpkg-src/vim/vim.spec 25 Jul 2003 09:18:40 -0000 1.151.2.3
+++ openpkg-src/vim/vim.spec 26 Jul 2003 13:36:24 -0000 1.151.2.4
@@ -26,7 +26,7 @@
# package versions
%define V_vl 6.2
%define V_vs 62
-%define V_pl 31
+%define V_pl 38
# package information
Name: vim
@@ -38,7 +38,7 @@
Group: Editor
License: Charityware
Version: %{V_vl}.%{V_pl}
-Release: 1.20030725
+Release: 1.20030726
# package options
%option with_x11 no
@@ -84,6 +84,13 @@
Patch29: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.029
Patch30: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.030
Patch31: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.031
+Patch32: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.032
+Patch33: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.033
+Patch34: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.034
+Patch35: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.035
+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
# build information
Prefix: %{l_prefix}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5829 -r1.5830 news.txt
--- openpkg-web/news.txt 26 Jul 2003 13:21:09 -0000 1.5829
+++ openpkg-web/news.txt 26 Jul 2003 13:36:12 -0000 1.5830
@@ -1,3 +1,21 @@
+26-Jul-2003: Upgraded package: P<vim-6.2.38-1.20030726>
+26-Jul-2003: Upgraded package: P<uucp-1.07-1.20030726>
+26-Jul-2003: Upgraded package: P<smtpfeed-1.18-1.20030726>
+26-Jul-2003: Upgraded package: P<postgresql-7.3.4-1.20030726>
+26-Jul-2003: Upgraded package: P<perl-www-1.20030726-1.20030726>
+26-Jul-2003: Upgraded package: P<patchutils-0.2.24-1.20030726>
+26-Jul-2003: Upgraded package: P<openldap-2.1.22-1.20030726>
+26-Jul-2003: Upgraded package: P<ksh-20030724-1.20030726>
+26-Jul-2003: Upgraded package: P<ircd-2.10.3p3-1.20030726>
+26-Jul-2003: Upgraded package: P<iozone-3.194-1.20030726>
+26-Jul-2003: Upgraded package: P<gmime-2.0.9-1.20030726>
+26-Jul-2003: Upgraded package: P<fsl-1.2.0-1.20030726>
+26-Jul-2003: Upgraded package: P<dsh-0.23.12-1.20030726>
+26-Jul-2003: Upgraded package: P<doxygen-1.3.3-1.20030726>
+26-Jul-2003: Upgraded package: P<dhcpd-3.0.1rc11-1.20030726>
+26-Jul-2003: Upgraded package: P<coreutils-5.0.1-1.20030726>
+26-Jul-2003: Upgraded package: P<bind-9.2.2-1.20030726>
+26-Jul-2003: Upgraded package: P<bash-2.05b-1.20030726>
26-Jul-2003: Upgraded package: P<perl-gtk-20030726-20030726>
26-Jul-2003: New package: P<perl-wx-20030726-20030726>
26-Jul-2003: New package: P<pgadmin-0.8.0.20030726-20030726>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
