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: 29-Jul-2003 12:11:48
Branch: OPENPKG_1_STABLE HEAD Handle: 2003072911113314
Added files: (Branch: OPENPKG_1_STABLE)
openpkg-src/delegate rc.delegate
openpkg-src/icon icon.patch
Modified files:
openpkg-web news.txt
Modified files: (Branch: OPENPKG_1_STABLE)
openpkg-src/curl curl.spec
openpkg-src/delegate delegate.spec
openpkg-src/dnstracer dnstracer.patch dnstracer.spec
openpkg-src/emacs emacs.spec
openpkg-src/hexer hexer.spec
openpkg-src/icon icon.spec
openpkg-src/ispell ispell.spec
openpkg-src/kerberos kerberos.patch kerberos.spec
openpkg-src/linkchecker linkchecker.spec
openpkg-src/nntpcache nntpcache.spec
openpkg-src/openpkg HISTORY openpkg.spec rc rpm.patch.bugfix
openpkg-src/openpkg-tool
Makefile openpkg-build.pl openpkg-index.pl
openpkg-tool.spec openpkg.1 openpkg.pod openpkg.sh
openpkg-src/openssh openssh.spec sshd_config
openpkg-src/perl-xml perl-xml.spec
openpkg-src/perltidy perltidy.spec
openpkg-src/proftpd proftpd.spec
openpkg-src/samba samba.spec
openpkg-src/vim vim.spec
Log:
MFC: all changes since last merge
Summary:
Revision Changes Path
1.38.2.3 +2 -2 openpkg-src/curl/curl.spec
1.40.2.5 +25 -1 openpkg-src/delegate/delegate.spec
1.1.2.1 +76 -0 openpkg-src/delegate/rc.delegate
1.1.2.2 +46 -6 openpkg-src/dnstracer/dnstracer.patch
1.15.2.3 +5 -6 openpkg-src/dnstracer/dnstracer.spec
1.32.2.3 +7 -2 openpkg-src/emacs/emacs.spec
1.22.2.3 +28 -5 openpkg-src/hexer/hexer.spec
1.1.2.1 +70 -0 openpkg-src/icon/icon.patch
1.7.2.3 +7 -4 openpkg-src/icon/icon.spec
1.29.2.4 +2 -2 openpkg-src/ispell/ispell.spec
1.1.2.3 +45 -0 openpkg-src/kerberos/kerberos.patch
1.10.2.4 +1 -1 openpkg-src/kerberos/kerberos.spec
1.14.2.3 +2 -2 openpkg-src/linkchecker/linkchecker.spec
1.26.2.4 +6 -7 openpkg-src/nntpcache/nntpcache.spec
1.1.2.1 +1 -1 openpkg-src/openpkg-tool/Makefile
1.39.2.9 +15 -14 openpkg-src/openpkg-tool/openpkg-build.pl
1.11.2.6 +1 -1 openpkg-src/openpkg-tool/openpkg-index.pl
1.27.2.11 +7 -4 openpkg-src/openpkg-tool/openpkg-tool.spec
1.4.2.4 +16 -16 openpkg-src/openpkg-tool/openpkg.1
1.10.2.6 +13 -12 openpkg-src/openpkg-tool/openpkg.pod
1.2.2.2 +1 -1 openpkg-src/openpkg-tool/openpkg.sh
1.19.2.3 +4 -0 openpkg-src/openpkg/HISTORY
1.127.2.6 +2 -2 openpkg-src/openpkg/openpkg.spec
1.19.2.5 +29 -10 openpkg-src/openpkg/rc
1.1.4.2 +16 -0 openpkg-src/openpkg/rpm.patch.bugfix
1.70.2.4 +1 -1 openpkg-src/openssh/openssh.spec
1.9.2.2 +1 -1 openpkg-src/openssh/sshd_config
1.47.2.5 +3 -3 openpkg-src/perl-xml/perl-xml.spec
1.14.2.3 +2 -2 openpkg-src/perltidy/perltidy.spec
1.42.2.4 +22 -17 openpkg-src/proftpd/proftpd.spec
1.35.2.5 +7 -5 openpkg-src/samba/samba.spec
1.151.2.6 +3 -2 openpkg-src/vim/vim.spec
1.5896 +18 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/curl/curl.spec
============================================================================
$ cvs diff -u -r1.38.2.2 -r1.38.2.3 curl.spec
--- openpkg-src/curl/curl.spec 24 Jul 2003 20:43:58 -0000 1.38.2.2
+++ openpkg-src/curl/curl.spec 29 Jul 2003 10:11:35 -0000 1.38.2.3
@@ -32,8 +32,8 @@
Distribution: OpenPKG [BASE]
Group: Web
License: GPL
-Version: 7.10.5
-Release: 1.20030724
+Version: 7.10.6
+Release: 1.20030729
# list of sources
Source0: http://curl.haxx.se/download/curl-%{version}.tar.bz2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/delegate/delegate.spec
============================================================================
$ cvs diff -u -r1.40.2.4 -r1.40.2.5 delegate.spec
--- openpkg-src/delegate/delegate.spec 25 Jul 2003 09:18:38 -0000
1.40.2.4
+++ openpkg-src/delegate/delegate.spec 29 Jul 2003 10:11:36 -0000
1.40.2.5
@@ -33,10 +33,11 @@
Group: Network
License: GPL
Version: 8.5.8
-Release: 1.20030725
+Release: 1.20030729
# list of sources
Source0: ftp://ftp:[EMAIL PROTECTED]/pub/DeleGate/delegate%{version}.tar.gz
+Source1: rc.delegate
# build information
Prefix: %{l_prefix}
@@ -70,15 +71,38 @@
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/sbin \
+ $RPM_BUILD_ROOT%{l_prefix}/var/delegate \
+ $RPM_BUILD_ROOT%{l_prefix}/var/delegate/cache \
$RPM_BUILD_ROOT%{l_prefix}/share/delegate
%{l_shtool} install -c -s -m 755 \
src/delegated $RPM_BUILD_ROOT%{l_prefix}/sbin/
%{l_shtool} install -c -m 644 \
doc/Manual.htm $RPM_BUILD_ROOT%{l_prefix}/share/delegate/manual.html
+
+ # 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.delegate} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} delegate status 2>/dev/null`
+ [ ".$delegate_active" = .yes ] && %{l_rc} delegate restart
+ exit 0
+
+%preun
+ # before erase, stop service
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} delegate stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/delegate/*.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/delegate/rc.delegate
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 rc.delegate
--- /dev/null 2003-07-29 12:11:36.000000000 +0200
+++ rc.delegate 2003-07-29 12:11:36.000000000 +0200
@@ -0,0 +1,76 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+## rc.delegate -- Run-Commands
+##
+
+%config
+ delegate_enable="$openpkg_rc_def"
+ delegate_params=""
+ delegate_bind="127.0.0.1"
+ delegate_port="8080"
+ delegate_log_prolog="true"
+ delegate_log_epilog="true"
+ delegate_log_numfiles="10"
+ delegate_log_minsize="1M"
+ delegate_log_complevel="9"
+
+%common
+ delegate_pidfile="@l_prefix@/var/delegate/delegate.pid"
+ delegate_signal () {
+ [ -f $delegate_pidfile ] && kill -$1 `cat $delegate_pidfile`
+ }
+ delegate_start () {
+ @l_prefix@/sbin/delegated \
+ -P${delegate_bind}${delegate_bind:+:}${delegate_port:-8080} \
+ OWNER="@l_musr@/@l_mgrp@" \
+ DGROOT="@l_prefix@/var/delegate" \
+ LOGDIR="@l_prefix@/var/delegate" \
+ LOGFILE="common.log" \
+ PROTOLOG="proto.log" \
+ ERRORLOG="error.log" \
+ TRACELOG="trace.log" \
+ PIDFILE=$delegate_pidfile $delegate_params
+ }
+ delegate_stop () {
+ delegate_signal TERM
+ rm -f $delegate_pidfile 2>/dev/null || true
+ }
+
+%status -u @l_susr@ -o
+ delegate_usable="unknown"
+ delegate_active="no"
+ rcService delegate enable yes && \
+ delegate_signal 0 && delegate_active="yes"
+ echo "delegate_enable=\"$delegate_enable\""
+ echo "delegate_usable=\"$delegate_usable\""
+ echo "delegate_active=\"$delegate_active\""
+
+%start -u @l_susr@
+ rcService delegate enable yes || exit 0
+ rcService delegate active yes && exit 0
+ delegate_start
+
+%stop -u @l_susr@
+ rcService delegate enable yes || exit 0
+ rcService delegate active no && exit 0
+ delegate_stop
+
+%restart -u @l_susr@
+ rcService delegate enable yes || exit 0
+ rcService delegate active no && exit 0
+ rc delegate stop start
+
+%daily -u @l_susr@
+ rcService delegate enable yes || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n ${delegate_log_numfiles} -s ${delegate_log_minsize} -d \
+ -z ${delegate_log_complevel} -m 644 -o @l_musr@ -g @l_mgrp@ \
+ -P "${delegate_log_prolog}" \
+ -E "${delegate_log_epilog} && rc delegate restart" \
+ @l_prefix@/var/delegate/common.log" \
+ @l_prefix@/var/delegate/proto.log" \
+ @l_prefix@/var/delegate/error.log" \
+ @l_prefix@/var/delegate/trace.log"
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dnstracer/dnstracer.patch
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 dnstracer.patch
--- openpkg-src/dnstracer/dnstracer.patch 24 Jul 2003 20:49:26 -0000 1.1.2.1
+++ openpkg-src/dnstracer/dnstracer.patch 29 Jul 2003 10:11:37 -0000 1.1.2.2
@@ -1,10 +1,50 @@
---- dnstracer.c.dist 2003-06-12 21:01:02.000000000 +0200
-+++ dnstracer.c 2003-06-12 21:10:38.000000000 +0200
-@@ -1246,7 +1246,11 @@
+--- dnstracer.c 2003-02-14 11:04:03.000000000 +0100
++++ dnstracer.c 2003-07-28 20:40:03.000000000 +0200
+@@ -603,7 +603,11 @@
+ get_resource(rr->type,session,rr->data,0));
+ }
+
++#ifdef NOIPV6
++void dump_data(struct sockaddr_in *dest4,void *dest6,struct dnssession *session) {
++#else
+ void dump_data(struct sockaddr_in *dest4,struct sockaddr_in6 *dest6,struct
dnssession *session) {
++#endif
+ struct dnsrr *answerrr;
+ struct dnsrr *authorityrr;
+ struct dnsrr *additionalrr;
+@@ -719,6 +723,7 @@
+ exit(1);
+ }
+
++#if defined(AI_NUMERICHOST) && defined(EAI_NODATA)
+ if (global_source_address!=NULL) {
+ struct addrinfo hints,*src_res;
+ int error;
+@@ -745,6 +750,7 @@
+ exit(1);
+ }
+ }
++#endif
+
+ return s;
+ }
+@@ -1084,7 +1090,11 @@
+ // don't have to worry about packets received from previous sessions.
+ //
+ session=(struct dnssession *)calloc(1,sizeof(struct dnssession));
++#ifdef NOIPV6
++ session->socket=create_socket(AF_INET);
++#else
+ session->socket=create_socket(ipv6?AF_INET6:AF_INET);
++#endif
+ session->ipv6=ipv6;
+ session->server=strdup(server_ip);
+ session->host=strdup(host);
+@@ -1246,7 +1256,11 @@
struct hostent *h;
char **addr_list=NULL;
-+#if defined(HAVE_GETHOSTBYNAME2)
++#ifndef NOIPV6
h=gethostbyname2(nextserver_name,ip==0?AF_INET:AF_INET6);
+#else
+ h=gethostbyname(nextserver_name);
@@ -12,11 +52,11 @@
if (h==NULL) continue;
//
-@@ -1480,8 +1484,12 @@
+@@ -1480,8 +1494,12 @@
{
struct hostent *h;
-+#if defined(HAVE_GETHOSTBYNAME2)
++#ifndef NOIPV6
if (((h=gethostbyname2(server_name,AF_INET6))==NULL) &&
((h=gethostbyname2(server_name,AF_INET))==NULL)) {
+#else
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dnstracer/dnstracer.spec
============================================================================
$ cvs diff -u -r1.15.2.2 -r1.15.2.3 dnstracer.spec
--- openpkg-src/dnstracer/dnstracer.spec 24 Jul 2003 20:49:26 -0000
1.15.2.2
+++ openpkg-src/dnstracer/dnstracer.spec 29 Jul 2003 10:11:37 -0000
1.15.2.3
@@ -33,7 +33,7 @@
Group: DNS
License: BSD
Version: 1.7
-Release: 1.20030724
+Release: 1.20030729
# list of sources
Source0: http://www.mavetju.org/download/dnstracer-%{version}.tar.gz
@@ -57,12 +57,10 @@
%patch -p0
%build
- # enable platform-specific patch
+ opts=""
case "%{l_target}" in
- solaris*) defs="" ;;
- *) defs="-DHAVE_GETHOSTBYNAME2" ;;
+ *-solaris* ) opts="--disable-ipv6" ;;
esac
-
ACLOCAL=true \
AUTOCONF=true \
AUTOMAKE=true \
@@ -70,7 +68,8 @@
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
./configure \
- --prefix=%{l_prefix}
+ --prefix=%{l_prefix} \
+ $opts
%{l_make} %{l_mflags -O}
%install
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.spec
============================================================================
$ cvs diff -u -r1.32.2.2 -r1.32.2.3 emacs.spec
--- openpkg-src/emacs/emacs.spec 24 Jul 2003 20:44:02 -0000 1.32.2.2
+++ openpkg-src/emacs/emacs.spec 29 Jul 2003 10:11:37 -0000 1.32.2.3
@@ -33,7 +33,7 @@
Group: Editor
License: GPL
Version: 21.3
-Release: 1.20030724
+Release: 1.20030729
# package options
%option with_x11 no
@@ -121,7 +121,12 @@
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/info
mv $RPM_BUILD_ROOT%{l_prefix}/info.old/emacs* $RPM_BUILD_ROOT%{l_prefix}/info/
rm -rf $RPM_BUILD_ROOT%{l_prefix}/info.old
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/emacs/etc
+ rm -rf \
+ $RPM_BUILD_ROOT%{l_prefix}/share/emacs/etc/[A-C]* \
+ $RPM_BUILD_ROOT%{l_prefix}/share/emacs/etc/D[A-N]* \
+ $RPM_BUILD_ROOT%{l_prefix}/share/emacs/etc/D[P-Z]* \
+ $RPM_BUILD_ROOT%{l_prefix}/share/emacs/etc/[E-Z]* \
+ $RPM_BUILD_ROOT%{l_prefix}/share/emacs/etc/[a-z]*
rmdir $RPM_BUILD_ROOT%{l_prefix}/share/emacs/leim
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/hexer/hexer.spec
============================================================================
$ cvs diff -u -r1.22.2.2 -r1.22.2.3 hexer.spec
--- openpkg-src/hexer/hexer.spec 24 Jul 2003 20:49:43 -0000 1.22.2.2
+++ openpkg-src/hexer/hexer.spec 29 Jul 2003 10:11:38 -0000 1.22.2.3
@@ -33,7 +33,7 @@
Group: Editor
License: BSD
Version: 0.1.4c
-Release: 1.20030724
+Release: 1.20030729
# list of sources
Source0:
ftp://ftp.netsw.org/system/tools/fileutils/edit/hexer-%{version}.tar.gz
@@ -55,25 +55,48 @@
%patch -p0
%build
+ # choose platform specific configuration file
+ # and always rely on having an ISO C compiler
ext=any
case "%{l_target}" in
*-freebsd* ) ext=bsd ;;
*-linux* ) ext=linux ;;
*-solaris* ) ext=sunos ;;
esac
- # always rely on ISO C compilers
%{l_shtool} install \
-e 's;\(USE_STDARG\).*;\1 1;' \
config.$ext config.h
- %{l_make} %{l_mflags} CC="%{l_cc}" CFLAGS="%{l_cflags -O} \$(DEFINES)"
+
+ # determine available terminal library
+ # kludge: determine whether vendor termcap, termlib or curses library exists
+ # reason: some brain-dead platforms (like SuSE, etc) have no termcap library
installed.
+ termlib=""
+ echo "int main(int argc, char *argv[]) { return 0; }" >dummy.c
+ for lib in termcap termlib curses ncurses; do
+ rc=0; %{l_cc} -o dummy dummy.c -l$lib >/dev/null 2>&1 || rc=1
+ if [ $rc -eq 0 ]; then termlib="-l$lib"; break; fi
+ done
+ [ ".$termlib" = . ] && exit 1
+
+ # build package
+ %{l_make} %{l_mflags} \
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O} \$(DEFINES)" \
+ TERMCAP="$termlib -lm"
%install
rm -rf $RPM_BUILD_ROOT
+
+ # install package
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/man/man1
- %{l_shtool} install -c -s -m 755 hexer $RPM_BUILD_ROOT%{l_prefix}/bin/
- %{l_shtool} install -c -m 644 hexer.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+ %{l_shtool} install -c -s -m 755 \
+ hexer $RPM_BUILD_ROOT%{l_prefix}/bin/
+ %{l_shtool} install -c -m 644 \
+ hexer.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/icon/icon.patch
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 icon.patch
--- /dev/null 2003-07-29 12:11:39.000000000 +0200
+++ icon.patch 2003-07-29 12:11:39.000000000 +0200
@@ -0,0 +1,70 @@
+--- /dev/null Thu Jan 1 01:00:00 1970
++++ config/intel_solaris/Makedefs Mon Jul 28 19:54:54 2003
+@@ -0,0 +1,19 @@
++# CC C compiler
++# CFLAGS flags for building C files
++# CFDYN additional flags for dynamic functions
++# RLINK flags for linking run-time system
++# RLIBS libraries to link with run-time system
++# TLIBS libraries to link for POSIX threads
++# XLIBS libraries to link for graphics
++# XPMDEFS definitions for building XPM library
++# GDIR directory of graphics helper library
++
++CC = gcc
++CFLAGS = -O -I/usr/openwin/include
++CFDYN = -fPIC
++RLINK =
++RLIBS = -lm -ldl
++TLIBS = -lposix4 -lpthread
++XLIBS = -L /usr/openwin/lib -Xlinker -R/usr/openwin/lib -lX11
++XPMDEFS = -DZPIPE -DSYSV
++GDIR = xpm
+--- /dev/null Thu Jan 1 01:00:00 1970
++++ config/intel_solaris/define.h Mon Jul 28 19:54:54 2003
+@@ -0,0 +1,10 @@
++/*
++ * Icon configuration file for Sun 4 running Solaris 2.x with Cygnus gcc
++ */
++
++#define UNIX 1
++#define LoadFunc
++
++/* use gcc to compile generated code */
++#define CComp "gcc"
++#define COpts "-I/usr/openwin/include -ldl"
+--- /dev/null Thu Jan 1 01:00:00 1970
++++ config/intel_solaris/rswitch.c Mon Jul 28 19:55:32 2003
+@@ -0,0 +1,28 @@
++/*
++ * This is the co-expression context switch for the Intel 80386
++ * under Solaris.
++ */
++
++/*
++ * coswitch
++ */
++
++coswitch(old_cs, new_cs, first)
++int *old_cs, *new_cs;
++int first;
++ {
++ asm(" movl 8(%ebp),%eax");
++ asm(" movl %esp,0(%eax)");
++ asm(" movl %ebp,4(%eax)");
++ asm(" movl 12(%ebp),%eax");
++ if (first == 0) { /* this is the first activation */
++ asm(" movl 0(%eax),%esp");
++ asm(" movl $0,%ebp");
++ new_context(0, 0);
++ syserr("new_context() returned in coswitch");
++ }
++ else {
++ asm(" movl 0(%eax),%esp");
++ asm(" movl 4(%eax),%ebp");
++ }
++ }
+--- /dev/null Thu Jan 1 01:00:00 1970
++++ config/intel_solaris/status Mon Jul 28 19:55:32 2003
+@@ -0,0 +1,1 @@
++This is from Icon 9.3.2's config/intel_solaris/.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/icon/icon.spec
============================================================================
$ cvs diff -u -r1.7.2.2 -r1.7.2.3 icon.spec
--- openpkg-src/icon/icon.spec 24 Jul 2003 20:49:46 -0000 1.7.2.2
+++ openpkg-src/icon/icon.spec 29 Jul 2003 10:11:38 -0000 1.7.2.3
@@ -37,10 +37,11 @@
Group: Language
License: GPL
Version: %{V_here}
-Release: 1.20030724
+Release: 1.20030729
# list of sources
Source0: ftp://ftp.cs.arizona.edu/icon/packages/unix/icon.v%{V_real}src.tgz
+Patch0: icon.patch
# build information
Prefix: %{l_prefix}
@@ -59,12 +60,14 @@
%prep
%setup -q -n icon.v%{V_real}src
+ %patch -p0
%build
case "%{l_target}" in
- *-freebsd* ) name="freebsd" ;;
- *-linux* ) name="linux" ;;
- *-solaris* ) name="sun_gcc" ;;
+ *-freebsd* ) name="freebsd" ;;
+ *-linux* ) name="linux" ;;
+ ix86-solaris* ) name="intel_solaris" ;;
+ sparc*-solaris* ) name="sun_gcc" ;;
* ) echo "platform %{l_target} not supported" 1>&2; exit 1 ;;
esac
%{l_make} %{l_mflags} Configure name=$name
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ispell/ispell.spec
============================================================================
$ cvs diff -u -r1.29.2.3 -r1.29.2.4 ispell.spec
--- openpkg-src/ispell/ispell.spec 28 Jul 2003 11:38:36 -0000 1.29.2.3
+++ openpkg-src/ispell/ispell.spec 29 Jul 2003 10:11:39 -0000 1.29.2.4
@@ -37,7 +37,7 @@
Group: Text
License: BSD
Version: %{V_ispell}
-Release: 1.20030728
+Release: 1.20030729
# list of sources
Source0: http://fmg-www.cs.ucla.edu/geoff/tars/ispell-%{V_ispell}.tar.gz
@@ -78,7 +78,7 @@
%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.
+ # reason: some brain-dead platforms (like SuSE, etc) have no termcap library
installed.
termlib=""
echo "int main(int argc, char *argv[]) { return 0; }" >dummy.c
for lib in termcap termlib curses ncurses; do
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.patch
============================================================================
$ cvs diff -u -r1.1.2.2 -r1.1.2.3 kerberos.patch
--- openpkg-src/kerberos/kerberos.patch 24 Jul 2003 20:49:51 -0000 1.1.2.2
+++ openpkg-src/kerberos/kerberos.patch 29 Jul 2003 10:11:40 -0000 1.1.2.3
@@ -345,3 +345,48 @@
char *
onoff(bool)
int bool;
+--- krb5-1.2.8/src/util/ss/pager.c.dist 2003-07-28 22:14:13.000000000 +0200
++++ krb5-1.2.8/src/util/ss/pager.c 2003-07-28 22:14:44.000000000 +0200
+@@ -10,6 +10,7 @@
+ #include "ss_internal.h"
+ #include "copyright.h"
+ #include <stdio.h>
++#include <errno.h>
+ #include <sys/types.h>
+ #include <sys/file.h>
+ #include <signal.h>
+@@ -17,7 +18,6 @@
+ static char MORE[] = "more";
+ extern char *_ss_pager_name;
+ extern char *getenv();
+-extern int errno;
+
+ /*
+ * this needs a *lot* of work....
+--- krb5-1.2.8/src/util/ss/help.c.dist 2003-07-28 22:14:19.000000000 +0200
++++ krb5-1.2.8/src/util/ss/help.c 2003-07-28 22:14:33.000000000 +0200
+@@ -8,12 +8,11 @@
+ #include <sys/types.h>
+ #include <sys/file.h>
+ #include <fcntl.h> /* just for O_* */
++#include <errno.h>
+ #include <sys/wait.h>
+ #include "ss_internal.h"
+ #include "copyright.h"
+
+-extern int errno;
+-
+ void ss_help (argc, argv, sci_idx, info_ptr)
+ int argc;
+ char const * const *argv;
+--- krb5-1.2.8/src/util/ss/parse.c.dist 2003-07-28 22:30:57.000000000 +0200
++++ krb5-1.2.8/src/util/ss/parse.c 2003-07-28 22:31:49.000000000 +0200
+@@ -7,6 +7,8 @@
+ #include "ss_internal.h"
+ #include "copyright.h"
+
++#include <errno.h>
++
+
+ enum parse_mode { WHITESPACE, TOKEN, QUOTED_STRING };
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.spec
============================================================================
$ cvs diff -u -r1.10.2.3 -r1.10.2.4 kerberos.spec
--- openpkg-src/kerberos/kerberos.spec 24 Jul 2003 20:49:51 -0000
1.10.2.3
+++ openpkg-src/kerberos/kerberos.spec 29 Jul 2003 10:11:40 -0000
1.10.2.4
@@ -33,7 +33,7 @@
Group: Cryptography
License: MIT
Version: 1.2.8
-Release: 1.20030724
+Release: 1.20030729
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/linkchecker/linkchecker.spec
============================================================================
$ cvs diff -u -r1.14.2.2 -r1.14.2.3 linkchecker.spec
--- openpkg-src/linkchecker/linkchecker.spec 24 Jul 2003 20:50:00 -0000
1.14.2.2
+++ openpkg-src/linkchecker/linkchecker.spec 29 Jul 2003 10:11:40 -0000
1.14.2.3
@@ -24,7 +24,7 @@
##
# package version
-%define V_linkchecker 1.8.20
+%define V_linkchecker 1.8.21
%define V_pydns 2.3.0
# package information
@@ -37,7 +37,7 @@
Group: Misc
License: GPL
Version: %{V_linkchecker}
-Release: 1.20030724
+Release: 1.20030729
# list of sources
Source0:
http://osdn.dl.sourceforge.net/linkchecker/linkchecker-%{V_linkchecker}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nntpcache/nntpcache.spec
============================================================================
$ cvs diff -u -r1.26.2.3 -r1.26.2.4 nntpcache.spec
--- openpkg-src/nntpcache/nntpcache.spec 28 Jul 2003 14:21:15 -0000
1.26.2.3
+++ openpkg-src/nntpcache/nntpcache.spec 29 Jul 2003 10:11:41 -0000
1.26.2.4
@@ -33,7 +33,7 @@
Group: News
License: BSD
Version: 3.0.1
-Release: 1.20030728
+Release: 1.20030729
# package options
%option with_fsl yes
@@ -84,12 +84,11 @@
%{l_shtool} subst \
-e 's;/etc/nntpcache/\(newshound\.conf\);%{l_prefix}/etc/nntpcache/\1;' \
contrib/newshound/getconf.c
- %{l_shtool} subst -s \
- -e 's;^\(pidFile .*\);#\1 ;' \
- -e 's;^\(adminEmail \).*;\1 [EMAIL PROTECTED];' \
- -e 's;^/usr/local/\(etc|var.*\);%{l_prefix}/\1;' \
- cf/nntpcache.config-dist
- %{l_shtool} subst -s \
+ %{l_shtool} subst \
+ -e 's;^\(string adminEmail\) .*;\1 "[EMAIL PROTECTED]";' \
+ -e 's;^\(bool httpServer\) .*;\1 no;' \
+ cf/nnconf.cf.in
+ %{l_shtool} subst \
-e 's;$libexecDir/nntpcache-gdb\.sh;true;' \
configure
( echo "nc_cv_UID=%{l_musr}"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/Makefile
============================================================================
$ cvs diff -u -r1.1 -r1.1.2.1 Makefile
--- openpkg-src/openpkg-tool/Makefile 26 Nov 2002 19:54:11 -0000 1.1
+++ openpkg-src/openpkg-tool/Makefile 29 Jul 2003 10:11:43 -0000 1.1.2.1
@@ -1,4 +1,4 @@
openpkg.1: openpkg.pod
- pod2man --section=1 --quotes=none --release="openpkg-tool" --center="OpenPKG
Maintainance" openpkg.pod >openpkg.1
+ pod2man --section=1 --quotes=none --release="openpkg-tool" --center="OpenPKG
Maintenance" openpkg.pod >openpkg.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================================
$ cvs diff -u -r1.39.2.8 -r1.39.2.9 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 24 Jul 2003 20:50:14 -0000
1.39.2.8
+++ openpkg-src/openpkg-tool/openpkg-build.pl 29 Jul 2003 10:11:43 -0000
1.39.2.9
@@ -1,5 +1,5 @@
##
-## openpkg-build.pl -- create build scripts from package index
+## openpkg-build.pl -- OpenPKG Maintenance Tool (backend for building)
## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
## Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Copyright (c) 2000-2003 Cable & Wireless <http://www.cw.com/>
@@ -515,8 +515,9 @@
# compute reverse dependency map
#
#
-sub get_revdep ($$) {
- my($env, $i) = @_;
+sub get_revdep ($) {
+ my($env) = @_;
+ my($i) = $env->{'installed'};
my($r) = $env->{'repository'};
my($pkg, %dep, %dlist, %rev);
my(@vers,$t,$t1,$t2,$with,$name,$vmap);
@@ -548,9 +549,9 @@
%d = unique_map($d,$k);
# resolve package
unless (exists $pkg{$pkg}) {
- ($t2,$old) = dep2target({ name => $pkg }, $env);
+ ($t2,$old) = dep2target({ name => $pkg }, $env, 1);
$t2 = undef if $old;
- $pkg{$pkg} = undef;
+ $pkg{$pkg} = $t2;
}
$t2 = $pkg{$pkg};
next unless $t2;
@@ -558,7 +559,7 @@
next if $_ eq 'OpenPKG';
# resolve target
unless (exists $name{$_}) {
- ($t1,$old) = dep2target($d{$_}, $env);
+ ($t1,$old) = dep2target($d{$_}, $env, 0);
$name{$_} = $t1 ? $t1->{name} : $_;
}
$name = $name{$_};
@@ -1615,8 +1616,8 @@
#
# locate target for a dependency
#
-sub dep2target ($$) {
- my($dep, $env) = @_;
+sub dep2target ($$$) {
+ my($dep, $env, $source) = @_;
my($name,$op,@vers);
my($i,$r,$b,$cond,$version);
my($t,$tdef,$why);
@@ -1654,11 +1655,11 @@
if ($i && (@vers = get_versions($i, $cond))) {
foreach (@vers) {
$t = $i->{$_}->[0];
- next unless $t &&
+ next unless $t;
get_with($t);
if (target_suitable($t, $env->{with}, 0)) {
$tdef = $t;
- unless ($env->{upgrade} || $env->{zero}) {
+ unless ($env->{upgrade} || $env->{zero} || $source) {
return ($t, 1);
}
}
@@ -1685,7 +1686,7 @@
if (!$tdef || (
($why = target_better($env, $t, $env->{installed})) &&
$why ne 'new'
- )) {
+ ) || $source) {
return ($t, 0);
}
}
@@ -1795,7 +1796,7 @@
# old index misses a OpenPKG provider in the index... skip it
next if $_ eq 'OpenPKG';
- ($t,$old) = dep2target($d{$_}, $env);
+ ($t,$old) = dep2target($d{$_}, $env, 0);
if ($t) {
if ($old) {
print "# $target->{name} uses ".vsn($t)." for $_\n";
@@ -1864,7 +1865,7 @@
if (!$env->{quick} && $target->{name} ne 'openpkg' ) {
unless ($env->{revdep}) {
- $env->{revdep} = get_revdep($env, $env->{installed});
+ $env->{revdep} = get_revdep($env);
}
foreach $t (@{$env->{revdep}->{$target->{name}}}) {
@@ -2021,7 +2022,7 @@
# cache reverse dependencies
#
unless ($env->{revdep}) {
- $env->{revdep} = get_revdep($env, $env->{repository});
+ $env->{revdep} = get_revdep($env);
}
#
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-index.pl
============================================================================
$ cvs diff -u -r1.11.2.5 -r1.11.2.6 openpkg-index.pl
--- openpkg-src/openpkg-tool/openpkg-index.pl 24 Jul 2003 20:50:14 -0000
1.11.2.5
+++ openpkg-src/openpkg-tool/openpkg-index.pl 29 Jul 2003 10:11:43 -0000
1.11.2.6
@@ -1,5 +1,5 @@
##
-## openpkg-index.pl -- create index from spec files
+## openpkg-index.pl -- OpenPKG Maintenance Tool (backend for indexing)
## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
## Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Copyright (c) 2000-2003 Cable & Wireless <http://www.cw.com/>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-tool.spec
============================================================================
$ cvs diff -u -r1.27.2.10 -r1.27.2.11 openpkg-tool.spec
--- openpkg-src/openpkg-tool/openpkg-tool.spec 24 Jul 2003 20:50:14 -0000
1.27.2.10
+++ openpkg-src/openpkg-tool/openpkg-tool.spec 29 Jul 2003 10:11:43 -0000
1.27.2.11
@@ -25,15 +25,15 @@
# package information
Name: openpkg-tool
-Summary: OpenPKG Tool
+Summary: OpenPKG Maintenance Tool
URL: http://www.openpkg.org/
Vendor: The OpenPKG Project
Packager: The OpenPKG Project
Distribution: OpenPKG [PLUS]
Group: Bootstrapping
License: GPL
-Version: 1.20030724
-Release: 1.20030724
+Version: 1.20030729
+Release: 1.20030729
# list of sources
Source0: openpkg.sh
@@ -52,7 +52,10 @@
AutoReqProv: no
%description
- The OpenPKG tool is a helper utility for managing an OpenPKG instance.
+ The OpenPKG tool is a frontend for maintaining an OpenPKG instance.
+ It currently provides indexing of RPM files ("openpkg index") and
+ automated recursive from-scratch installation and updating of
+ existing RPM packages ("openpkg build").
%prep
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg.1
============================================================================
$ cvs diff -u -r1.4.2.3 -r1.4.2.4 openpkg.1
--- openpkg-src/openpkg-tool/openpkg.1 24 Jul 2003 20:50:14 -0000 1.4.2.3
+++ openpkg-src/openpkg-tool/openpkg.1 29 Jul 2003 10:11:43 -0000 1.4.2.4
@@ -129,9 +129,9 @@
.\" ========================================================================
.\"
.IX Title "OPENPKG 1"
-.TH OPENPKG 1 "2003-07-16" "openpkg-tool" "OpenPKG Maintainance"
+.TH OPENPKG 1 "2003-07-28" "openpkg-tool" "OpenPKG Maintenance"
.SH "NAME"
-\&\fBopenpkg\fR \- \fBOpenPKG\fR maintainance utility
+\&\fBopenpkg\fR \- \fBOpenPKG\fR Maintenance Tool
.SH "VERSION"
.IX Header "VERSION"
openpkg-tool XX-VERSION-XX
@@ -178,10 +178,10 @@
([\fB\-a\fR] [\fB\-A\fR] | \fIpatternlist\fR)
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
-\&\fBopenpkg\fR is a frontend utility for maintaining an \fBOpenPKG\fR instance.
-It currently provides indexing of \s-1RPM\s0 files (\fBopenpkg index\fR) and
-automated recursive from-scratch installation and updating of existing
-\&\s-1RPM\s0 packages (\fBopenpkg build\fR).
+The \fBopenpkg\fR tool is a frontend for maintaining an \fBOpenPKG\fR
+instance. It currently provides indexing of \s-1RPM\s0 files (\fBopenpkg index\fR)
+and automated recursive from-scratch installation and updating of
+existing \s-1RPM\s0 packages (\fBopenpkg build\fR).
.SH "COMMANDS"
.IX Header "COMMANDS"
.Sh "\s-1OPENPKG\s0 \s-1INDEX\s0"
@@ -234,7 +234,7 @@
.PP
Packages are selected by providing a list of name patterns. Each
pattern is either a package name or a prefix followed by a '*'
-character. Additionally you can append a discrimation prefix separated
+character. Additionally you can append a discrimination prefix separated
by a comma that matches against the full name-version-revision
string.
.PP
@@ -252,7 +252,7 @@
.IP "\fB\-f\fR \fIindex.rdf\fR" 4
.IX Item "-f index.rdf"
Specify a path to the primary \s-1XML/RDF\s0 index, this can be a \s-1URL\s0 or a
-file path. If the index contains references to aother indexes these are
+file path. If the index contains references to other indexes these are
included automatically. The default is to use a \s-1URL\s0 pointing to the
\&\fBOpenPKG\fR \s-1FTP\s0 server for the \fBOpenPKG\fR release you are using.
.IP "\fB\-u\fR" 4
@@ -314,7 +314,7 @@
conflicts with some already installed package.
.IP "\s-1UNDEF\s0" 4
.IX Item "UNDEF"
-The package has an invalid or ambigous dependency.
+The package has an invalid or ambiguous dependency.
.RE
.RS 4
.RE
@@ -341,7 +341,7 @@
options had been switched on. This has little use except for generating
an all-inclusive list with the \fB\-L\fR option.
\&\fI\s-1ATTENTION:\s0 Even mutually exclusive options are evaluated to be 'on',
-building packages with \f(BI\-W\fI therefore might fail or cause unusuable
+building packages with \f(BI\-W\fI therefore might fail or cause unusable
results!\fR
.IP "\fB\-X\fR" 4
.IX Item "-X"
@@ -363,12 +363,12 @@
.IX Item "-B"
Same as \-b but also check all packages for existing binary packages
at run\-time.
-.IP "\fB\-g\fR The generated script will rebuild all packages selected even when
the most recent version is already installed. Dependencies are not affected." 4
-.IX Item "-g The generated script will rebuild all packages selected even when the
most recent version is already installed. Dependencies are not affected."
-.PD 0
+.IP "\fB\-g\fR" 4
+.IX Item "-g"
+The generated script will rebuild all packages selected even when the
+most recent version is already installed. Dependencies are not affected.
.IP "\fB\-P\fR \fIpriv-cmd\fR" 4
.IX Item "-P priv-cmd"
-.PD
Command prefix to use for install commands that require elevated
privileges. The most common tool for this is \fIsudo\fR\|(8). If \fIpriv-cmd\fR
starts with a dash it will be run without the dash and the command
@@ -429,8 +429,8 @@
.IX Header "HISTORY"
The \fBopenpkg index\fR and \fBopenpkg build\fR command
was invented in November 2002 by \fIMichael van Elst\fR
-<[EMAIL PROTECTED]> under contract with \fICable & Wireless
-Germany\fR <http://www.cw.com/de/> for use inside the \fBOpenPKG\fR
+<[EMAIL PROTECTED]> under contract with \fICable & Wireless\fR
+<http://www.cw.com/> for use inside the \fBOpenPKG\fR
project <http://www.openpkg.org/>.
.SH "AUTHORS"
.IX Header "AUTHORS"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg.pod
============================================================================
$ cvs diff -u -r1.10.2.5 -r1.10.2.6 openpkg.pod
--- openpkg-src/openpkg-tool/openpkg.pod 24 Jul 2003 20:50:14 -0000
1.10.2.5
+++ openpkg-src/openpkg-tool/openpkg.pod 29 Jul 2003 10:11:43 -0000
1.10.2.6
@@ -1,5 +1,5 @@
##
-## openpkg.pod -- OpenPKG maintainance utility (frontend manual page)
+## openpkg.pod -- OpenPKG Maintenance Tool (manual page)
## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
## Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Copyright (c) 2000-2003 Cable & Wireless <http://www.cw.com/>
@@ -27,7 +27,7 @@
=head1 NAME
-B<openpkg> - B<OpenPKG> maintainance utility
+B<openpkg> - B<OpenPKG> Maintenance Tool
=head1 VERSION
@@ -77,10 +77,10 @@
=head1 DESCRIPTION
-B<openpkg> is a frontend utility for maintaining an B<OpenPKG> instance.
-It currently provides indexing of RPM files (B<openpkg index>) and
-automated recursive from-scratch installation and updating of existing
-RPM packages (B<openpkg build>).
+The B<openpkg> tool is a frontend for maintaining an B<OpenPKG>
+instance. It currently provides indexing of RPM files (B<openpkg index>)
+and automated recursive from-scratch installation and updating of
+existing RPM packages (B<openpkg build>).
=head1 COMMANDS
@@ -145,7 +145,7 @@
Packages are selected by providing a list of name patterns. Each
pattern is either a package name or a prefix followed by a '*'
-character. Additionally you can append a discrimation prefix separated
+character. Additionally you can append a discrimination prefix separated
by a comma that matches against the full name-version-revision
string.
@@ -168,7 +168,7 @@
=item B<-f> I<index.rdf>
Specify a path to the primary XML/RDF index, this can be a URL or a
-file path. If the index contains references to aother indexes these are
+file path. If the index contains references to other indexes these are
included automatically. The default is to use a URL pointing to the
B<OpenPKG> FTP server for the B<OpenPKG> release you are using.
@@ -245,7 +245,7 @@
=item UNDEF
-The package has an invalid or ambigous dependency.
+The package has an invalid or ambiguous dependency.
=back
@@ -276,7 +276,7 @@
options had been switched on. This has little use except for generating
an all-inclusive list with the B<-L> option.
I<ATTENTION: Even mutually exclusive options are evaluated to be 'on',
-building packages with B<-W> therefore might fail or cause unusuable
+building packages with B<-W> therefore might fail or cause unusable
results!>
=item B<-X>
@@ -305,6 +305,7 @@
at run-time.
=item B<-g>
+
The generated script will rebuild all packages selected even when the
most recent version is already installed. Dependencies are not affected.
@@ -383,8 +384,8 @@
The B<openpkg index> and B<openpkg build> command
was invented in November 2002 by I<Michael van Elst>
-E<lt>[EMAIL PROTECTED]<gt> under contract with I<Cable & Wireless
-Germany> E<lt>http://www.cw.com/de/E<gt> for use inside the B<OpenPKG>
+E<lt>[EMAIL PROTECTED]<gt> under contract with I<Cable & Wireless>
+E<lt>http://www.cw.com/E<gt> for use inside the B<OpenPKG>
project E<lt>http://www.openpkg.org/E<gt>.
=head1 AUTHORS
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg.sh
============================================================================
$ cvs diff -u -r1.2.2.1 -r1.2.2.2 openpkg.sh
--- openpkg-src/openpkg-tool/openpkg.sh 24 Jul 2003 20:50:14 -0000 1.2.2.1
+++ openpkg-src/openpkg-tool/openpkg.sh 29 Jul 2003 10:11:43 -0000 1.2.2.2
@@ -1,6 +1,6 @@
[EMAIL PROTECTED]@/lib/openpkg/bash
##
-## openpkg.sh -- OpenPKG maintainance utility (frontend)
+## openpkg.sh -- OpenPKG Maintenance Tool (frontend)
## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
## Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Copyright (c) 2000-2003 Cable & Wireless <http://www.cw.com/>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.19.2.2 -r1.19.2.3 HISTORY
--- openpkg-src/openpkg/HISTORY 28 Jul 2003 11:38:39 -0000 1.19.2.2
+++ openpkg-src/openpkg/HISTORY 29 Jul 2003 10:11:42 -0000 1.19.2.3
@@ -2,6 +2,10 @@
2003
====
+20030729 rc: fixed processing of $openpkg_rc_def (requires pre-inclusion of rc.conf)
+20030729 fixed nasty filedescriptor leakage in RPM on script execution
+20030728 upgraded to cURL 7.10.6
+20030728 rc: stop processing 'start' and 'restart' scripts if .rpmsave files exists
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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.127.2.5 -r1.127.2.6 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 28 Jul 2003 11:38:39 -0000 1.127.2.5
+++ openpkg-src/openpkg/openpkg.spec 29 Jul 2003 10:11:42 -0000 1.127.2.6
@@ -39,14 +39,14 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 1.20030728
+%define V_openpkg 1.20030729
# the used software versions
%define V_rpm 4.0.2
%define V_zlib 1.1.4
%define V_bzip2 1.0.2
%define V_db 3.2.9
-%define V_curl 7.10.5
+%define V_curl 7.10.6
%define V_make 3.80
%define V_gzip 1.3.5
%define V_patch 2.5.4
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.19.2.4 -r1.19.2.5 rc
--- openpkg-src/openpkg/rc 28 Jul 2003 11:38:39 -0000 1.19.2.4
+++ openpkg-src/openpkg/rc 29 Jul 2003 10:11:42 -0000 1.19.2.5
@@ -31,7 +31,7 @@
# program name, version and date
progname="rc"
progvers="1.2.0"
-progdate="16-Jul-2003"
+progdate="28-Jul-2003"
# path to OpenPKG instance
prefix="@l_prefix@"
@@ -149,15 +149,18 @@
# handle --query option
if [ ".$query" = .1 ]; then
- # suck in %config sections of all scripts for default values
- scripts=`/bin/ls $rcdir/rc.* | sed -e "s;^$rcdir/rc\.;;"`
+ # suck in all %config sections of all scripts
+ # (rc.openpkg is special: has to be first and requires pre-inclusion of
rc.conf)
touch $tmpfile
+ sed <$rcdir/rc.openpkg >>$tmpfile -e "1,/^%config/d" -e '/^%.*/,$d'
+ echo ". $rcconf" >>$tmpfile
+ scripts=`/bin/ls $rcdir/rc.* | sed -e "s;^$rcdir/rc\.;;" | egrep -v '^openpkg$'`
for s_name in $scripts; do
sed <$rcdir/rc.$s_name >>$tmpfile -e "1,/^%config/d" -e '/^%.*/,$d'
done
. $tmpfile
- # apply override values
+ # apply override values to get effective values
. $rcconf
# display variable value
@@ -171,9 +174,12 @@
# handle --config option
if [ ".$config" = .1 ]; then
- # suck in %config sections of all scripts for default values
- scripts=`/bin/ls $rcdir/rc.* | sed -e "s;^$rcdir/rc\.;;"`
+ # suck in all %config sections of all scripts
+ # (rc.openpkg is special: has to be first and requires pre-inclusion of
rc.conf)
touch $tmpfile
+ sed <$rcdir/rc.openpkg >>$tmpfile -e "1,/^%config/d" -e '/^%.*/,$d'
+ echo ". $rcconf" >>$tmpfile
+ scripts=`/bin/ls $rcdir/rc.* | sed -e "s;^$rcdir/rc\.;;" | egrep -v '^openpkg$'`
for s_name in $scripts; do
sed <$rcdir/rc.$s_name >>$tmpfile -e "1,/^%config/d" -e '/^%.*/,$d'
done
@@ -287,8 +293,15 @@
# check for upgraded package with unresolved configuration file conflicts
if [ -d "$prefix/etc/$s_name" -a ".$eval" != .1 ]; then
if [ ".`find $prefix/etc/$s_name -print 2>/dev/null | egrep
'.*\.rpm(new|orig|save)$'`" != . ]; then
- echo "openpkg:rc:WARNING: package \"$s_name\" has unresolved
configuration file conflicts" 1>&2
- echo "openpkg:rc:WARNING: indicated by \"*.rpm(new|orig|save)\"
files in \"$prefix/etc/$s_name\"" 1>&2
+ case "$cmd" in
+ start|restart ) type="ERROR" ;;
+ * ) type="WARNING" ;;
+ esac
+ echo "openpkg:rc:${type}: package \"$s_name\" has unresolved
configuration file conflicts" 1>&2
+ echo "openpkg:rc:${type}: indicated by \"*.rpm(new|orig|save)\"
files in \"$prefix/etc/$s_name\"" 1>&2
+ if [ ".$type" = .ERROR ]; then
+ continue
+ fi
fi
fi
@@ -411,8 +424,11 @@
# because by design all command scripts see the %config
# section of all(!) scripts. Because of $openpkg_rc_def the
# variable, we place the %config section of "openpkg" to the front.
+ # And we have to extra pre-include the rc.conf to allow
+ # rc.conf to override the default of $openpkg_rc_def, too.
+ sed <$rcdir/rc.openpkg >>$tmpfile -e "1,/^%config/d" -e '/^%.*/,$d'
+ echo ". $rcconf" >>$tmpfile
l_scripts=`/bin/ls $rcdir/rc.* | sed -e "s;^$rcdir/rc\.;;" | egrep -v
'^openpkg$'`
- l_scripts="openpkg $l_scripts"
for l_name in $l_scripts; do
sed <$rcdir/rc.$l_name >>$tmpfile -e "1,/^%config/d" -e '/^%.*/,$d'
done
@@ -498,8 +514,11 @@
# because by design all command scripts see the %config
# section of all(!) scripts. Because of $openpkg_rc_def the
# variable, we place the %config section of "openpkg" to the front.
+ # And we have to extra pre-include the rc.conf to allow
+ # rc.conf to override the default of $openpkg_rc_def, too.
+ sed <$rcdir/rc.openpkg >>$tmpfile -e "1,/^%config/d" -e '/^%.*/,$d'
+ echo ". $rcconf" >>$tmpfile
l_scripts=`/bin/ls $rcdir/rc.* | sed -e "s;^$rcdir/rc\.;;" | egrep -v
'^openpkg$'`
- l_scripts="openpkg $l_scripts"
for l_name in $l_scripts; do
sed <$rcdir/rc.$l_name >>$tmpfile -e "1,/^%config/d" -e '/^%.*/,$d'
done
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.1.4.1 -r1.1.4.2 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 24 Jul 2003 20:42:00 -0000 1.1.4.1
+++ openpkg-src/openpkg/rpm.patch.bugfix 29 Jul 2003 10:11:42 -0000 1.1.4.2
@@ -109,3 +109,19 @@
break;
default:
break;
++---------------------------------------------------------------------------
+| Make sure that spawned childs (%xxxx scripts) do not have
+| a *copy* of the STDOUT filedescriptor of the RPM caller open.
++---------------------------------------------------------------------------
+--- lib/uninstall.c.orig Mon Jan 22 16:59:13 2001
++++ lib/uninstall.c Tue Jul 29 10:16:33 2003
+@@ -389,6 +389,9 @@
+ Fclose (ts->scriptFd);
+ }
+ }
++ else {
++ Fclose(out);
++ }
+
+ { const char *ipath = rpmExpand("PATH=%{_install_script_path}", NULL);
+ const char *path = SCRIPT_PATH;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.70.2.3 -r1.70.2.4 openssh.spec
--- openpkg-src/openssh/openssh.spec 24 Jul 2003 20:42:02 -0000 1.70.2.3
+++ openpkg-src/openssh/openssh.spec 29 Jul 2003 10:11:44 -0000 1.70.2.4
@@ -38,7 +38,7 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 1.20030724
+Release: 1.20030729
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/sshd_config
============================================================================
$ cvs diff -u -r1.9.2.1 -r1.9.2.2 sshd_config
--- openpkg-src/openssh/sshd_config 24 Jul 2003 20:42:02 -0000 1.9.2.1
+++ openpkg-src/openssh/sshd_config 29 Jul 2003 10:11:44 -0000 1.9.2.2
@@ -3,7 +3,7 @@
##
Port 22
-ListenAddress 0.0.0.0
+ListenAddress 127.0.0.1
Subsystem sftp @l_prefix@/libexec/openssh/sftp-server
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-xml/perl-xml.spec
============================================================================
$ cvs diff -u -r1.47.2.4 -r1.47.2.5 perl-xml.spec
--- openpkg-src/perl-xml/perl-xml.spec 28 Jul 2003 11:38:41 -0000
1.47.2.4
+++ openpkg-src/perl-xml/perl-xml.spec 29 Jul 2003 10:11:45 -0000
1.47.2.5
@@ -29,7 +29,7 @@
%define V_xml_libxml 1.54_4
%define V_xml_libxslt 1.53
%define V_xml_regexp 0.03
-%define V_xml_dom 1.42
+%define V_xml_dom 1.43
%define V_xml_simple 2.08
%define V_xml_namespacesupport 1.08
%define V_xml_sax 0.12
@@ -62,8 +62,8 @@
Distribution: OpenPKG [BASE]
Group: Language
License: GPL/Artistic
-Version: 1.20030728
-Release: 1.20030728
+Version: 1.20030729
+Release: 1.20030729
# package options
%option with_libxml no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perltidy/perltidy.spec
============================================================================
$ cvs diff -u -r1.14.2.2 -r1.14.2.3 perltidy.spec
--- openpkg-src/perltidy/perltidy.spec 24 Jul 2003 20:50:20 -0000
1.14.2.2
+++ openpkg-src/perltidy/perltidy.spec 29 Jul 2003 10:11:45 -0000
1.14.2.3
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: Development
License: GPL
-Version: 20021130
-Release: 1.20030724
+Version: 20030726
+Release: 1.20030729
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/perltidy/Perl-Tidy-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
============================================================================
$ cvs diff -u -r1.42.2.3 -r1.42.2.4 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 24 Jul 2003 20:45:09 -0000 1.42.2.3
+++ openpkg-src/proftpd/proftpd.spec 29 Jul 2003 10:11:46 -0000 1.42.2.4
@@ -33,7 +33,7 @@
Group: FTP
License: GPL
Version: 1.2.8
-Release: 1.20030724
+Release: 1.20030729
# package options
%option with_mysql no
@@ -81,20 +81,21 @@
AutoReqProv: no
%description
- ProFTPD grew out of the desire to have a secure and configurable FTP
- server, and out of a significant admiration of the Apache web server.
- There are currently a very limited number of FTP servers running on unix
- (or unix-like) hosts. The most commonly used server is probably wu-ftpd.
- While wu-ftpd provides excellent performance and is generally a good
- product, it lacks numerous features found in newer Win32 FTP servers, and
- has a poor security history. Many people, including the developers who
- work on ProFTPD have spent a great deal of time fixing bugs and hacking
- features into wu-ftpd. Unfortunately, it quickly became clear that a
- complete redesign was necessary in order to implement the configurability
- and features desired. ProFTPD is not a hack based on any other server,
- it's an independent source tree from the ground up. Click here for a small
- list of some of the sites ProFTPD powers -- many of them handling large
- volumes of traffic on a daily basis.
+ ProFTPD grew out of the desire to have a secure and configurable
+ FTP server, and out of a significant admiration of the Apache web
+ server. There are currently a very limited number of FTP servers
+ running on unix (or unix-like) hosts. The most commonly used server
+ is probably wu-ftpd. While wu-ftpd provides excellent performance
+ and is generally a good product, it lacks numerous features found
+ in newer Win32 FTP servers, and has a poor security history. Many
+ people, including the developers who work on ProFTPD have spent a
+ great deal of time fixing bugs and hacking features into wu-ftpd.
+ Unfortunately, it quickly became clear that a complete redesign was
+ necessary in order to implement the configurability and features
+ desired. ProFTPD is not a hack based on any other server, it's an
+ independent source tree from the ground up. Click here for a small
+ list of some of the sites ProFTPD powers -- many of them handling
+ large volumes of traffic on a daily basis.
%prep
%setup -q
@@ -114,7 +115,7 @@
contrib/mod_sql_mysql.c
%endif
# libpq also requires openssl
- # postgresql also doesn't provide its own inlude subdirectory
+ # postgresql also doesn't provide its own include subdirectory
%{l_shtool} subst \
-e 's;\(-lpq\);\1 -lssl -lcrypto;g' \
-e 's;^\(#include <\)pgsql/\(libpq-fe.h>.*\)$;\1postgresql/\2;' \
@@ -143,9 +144,11 @@
MOD="$MOD:mod_sql"
%if "%{with_mysql}" == "yes"
MOD="$MOD:mod_sql_mysql"
+ MOD_INC=":%{l_prefix}/include/mysql"
%endif
%if "%{with_pgsql}" == "yes"
MOD="$MOD:mod_sql_postgres"
+ MOD_INC=":%{l_prefix}/include/postgresql"
%endif
%endif
%if "%{with_ldap}" == "yes"
@@ -193,6 +196,8 @@
%{l_make} %{l_mflags} \
install-proftpd install-utils install-man \
prefix=$RPM_BUILD_ROOT%{l_prefix} \
+ bindir=$RPM_BUILD_ROOT%{l_prefix}/bin \
+ sbindir=$RPM_BUILD_ROOT%{l_prefix}/sbin \
sysconfdir=$RPM_BUILD_ROOT%{l_prefix}/etc/proftpd \
localstatedir=$RPM_BUILD_ROOT%{l_prefix}/var/proftpd \
rundir=$RPM_BUILD_ROOT%{l_prefix}/var/proftpd
@@ -232,7 +237,7 @@
# determine the package ingredients
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/etc/proftpd/proftpd.conf'
+ '%config %attr(0600,%{l_susr},%{l_sgrp})
%{l_prefix}/etc/proftpd/proftpd.conf'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.spec
============================================================================
$ cvs diff -u -r1.35.2.4 -r1.35.2.5 samba.spec
--- openpkg-src/samba/samba.spec 24 Jul 2003 20:45:17 -0000 1.35.2.4
+++ openpkg-src/samba/samba.spec 29 Jul 2003 10:11:47 -0000 1.35.2.5
@@ -33,7 +33,7 @@
Group: Filesystem
License: GPL
Version: 2.2.8a
-Release: 1.20030724
+Release: 1.20030729
# package options
%option with_pam no
@@ -69,15 +69,16 @@
cd source
CC="%{l_cc}"
CFLAGS="%{l_cflags -O}"
- CPPFLAGS="%{l_cppflags openssl}"
+ CPPFLAGS="%{l_cppflags openssl} -DOPENSSL_DISABLE_OLD_DES_SUPPORT"
LDFLAGS="%{l_ldflags}"
%if "%{with_pam}" == "yes"
- CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/etc/rc --query pam_incdir`" \
- LDFLAGS="$LDFLAGS -L`%{l_prefix}/etc/rc --query pam_libdir`" \
+ CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/etc/rc --query pam_incdir`"
+ LDFLAGS="$LDFLAGS -L`%{l_prefix}/etc/rc --query pam_libdir`"
%endif
export CC
export CFLAGS
export LDFLAGS
+ export CPPFLAGS
./configure \
--prefix=%{l_prefix} \
--localstatedir=%{l_prefix}/var/samba/run \
@@ -87,7 +88,8 @@
--with-lockdir=%{l_prefix}/var/samba/run \
--with-swatdir=%{l_prefix}/share/samba \
--with-codepagedir=%{l_prefix}/share/samba \
- --with-ssl --with-sslinc=%{l_prefix}/include \
+ --with-ssl \
+ --with-sslinc=%{l_prefix}/include \
--with-included-popt \
%if "%{with_pam}" == "yes"
--with-pam \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vim/vim.spec
============================================================================
$ cvs diff -u -r1.151.2.5 -r1.151.2.6 vim.spec
--- openpkg-src/vim/vim.spec 28 Jul 2003 11:38:45 -0000 1.151.2.5
+++ openpkg-src/vim/vim.spec 29 Jul 2003 10:11:47 -0000 1.151.2.6
@@ -26,7 +26,7 @@
# package versions
%define V_vl 6.2
%define V_vs 62
-%define V_pl 56
+%define V_pl 57
# package information
Name: vim
@@ -38,7 +38,7 @@
Group: Editor
License: Charityware
Version: %{V_vl}.%{V_pl}
-Release: 1.20030728
+Release: 1.20030729
# package options
%option with_x11 no
@@ -109,6 +109,7 @@
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
+Patch57: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.057
# build information
Prefix: %{l_prefix}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5895 -r1.5896 news.txt
--- openpkg-web/news.txt 29 Jul 2003 09:58:50 -0000 1.5895
+++ openpkg-web/news.txt 29 Jul 2003 10:11:33 -0000 1.5896
@@ -1,3 +1,21 @@
+29-Jul-2003: Upgraded package: P<vim-6.2.57-1.20030729>
+29-Jul-2003: Upgraded package: P<samba-2.2.8a-1.20030729>
+29-Jul-2003: Upgraded package: P<proftpd-1.2.8-1.20030729>
+29-Jul-2003: Upgraded package: P<perltidy-20030726-1.20030729>
+29-Jul-2003: Upgraded package: P<perl-xml-1.20030729-1.20030729>
+29-Jul-2003: Upgraded package: P<openssh-3.6.1p2-1.20030729>
+29-Jul-2003: Upgraded package: P<openpkg-tool-1.20030729-1.20030729>
+29-Jul-2003: Upgraded package: P<openpkg-1.20030729-1.20030729>
+29-Jul-2003: Upgraded package: P<nntpcache-3.0.1-1.20030729>
+29-Jul-2003: Upgraded package: P<linkchecker-1.8.21-1.20030729>
+29-Jul-2003: Upgraded package: P<kerberos-1.2.8-1.20030729>
+29-Jul-2003: Upgraded package: P<ispell-3.2.06-1.20030729>
+29-Jul-2003: Upgraded package: P<icon-9.4.2-1.20030729>
+29-Jul-2003: Upgraded package: P<hexer-0.1.4c-1.20030729>
+29-Jul-2003: Upgraded package: P<emacs-21.3-1.20030729>
+29-Jul-2003: Upgraded package: P<dnstracer-1.7-1.20030729>
+29-Jul-2003: Upgraded package: P<delegate-8.5.8-1.20030729>
+29-Jul-2003: Upgraded package: P<curl-7.10.6-1.20030729>
29-Jul-2003: Upgraded package: P<proftpd-1.2.9rc1-20030729>
29-Jul-2003: Upgraded package: P<samba-2.2.8a-20030729>
29-Jul-2003: Upgraded package: P<openssh-3.6.1p2-20030729>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
