[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY rc.openpkg
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Mar-2007 23:12:43 Branch: HEAD Handle: 2007032022124300 Modified files: openpkg-src/openpkg HISTORY rc.openpkg Log: automatic (re-)registration if previous registration, community series or release set to openpkg URLs Summary: RevisionChanges Path 1.440 +1 -0 openpkg-src/openpkg/HISTORY 1.23+12 -6 openpkg-src/openpkg/rc.openpkg patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.439 -r1.440 HISTORY --- openpkg-src/openpkg/HISTORY 20 Mar 2007 12:50:58 - 1.439 +++ openpkg-src/openpkg/HISTORY 20 Mar 2007 22:12:43 - 1.440 @@ -2,6 +2,7 @@ 2007 +20070320 automatic (re-)registration if previous registration, community series or release set to openpkg URLs 20070320 improve generation of UUID_PLATFORM by using a better (no longer IP based) "discriminator" value 20070320 remove old support for never finished rcng 20070320 remove old backward compatibility from rc.func for OpenPKG 1.2's opXXX functions @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/rc.openpkg $ cvs diff -u -r1.22 -r1.23 rc.openpkg --- openpkg-src/openpkg/rc.openpkg21 Feb 2007 10:42:44 - 1.22 +++ openpkg-src/openpkg/rc.openpkg20 Mar 2007 22:12:43 - 1.23 @@ -28,12 +28,18 @@ %hourly -u @l_musr@ rcService openpkg enable yes || exit 0 -reregister=0; @l_prefix@/bin/openpkg register --printstatus >/dev/null 2>&1 && reregister=1 -# check for "openpkg" executable from the OpenPKG Community series -# if OSS, register with openpkg.org -[EMAIL PROTECTED]@/bin/openpkg --license 2>/dev/null | \ -sed -e 'q' | egrep '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-C'` -if [ ".$community_version" != . -o $reregister -eq 1 ]; then +# automatic (re-)registration +reregister=0 +# re-register if previously registered +@l_prefix@/bin/openpkg register --printstatus >/dev/null 2>&1 && reregister=1 +# re-register if "openpkg" executable from community series +[ $reregister -eq 0 ] && @l_prefix@/bin/openpkg --license 2>/dev/null \ +| sed -e 'q' | egrep '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-C' >/dev/null && reregister=1 +# re-register if "openpkg release" configured to pull packages directly from openpkg.(org|com|net) +[ $reregister -eq 0 ] && @l_prefix@/bin/openpkg release --fmt='%u' \ +| egrep '^[^:]*://(([^:]*:)?([EMAIL PROTECTED]@)?)?([^/]*\.)?openpkg\.(com|org|net)/' >/dev/null && reregister=1 +# perform (re-)registration +if [ $reregister -eq 1 ]; then [ $openpkg_reghour -lt 00 -o $openpkg_reghour -gt 23 ] && openpkg_reghour="3" now=`date '+%H'` [ $openpkg_reghour -eq $now ] || exit 0 @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/multitail/ multitail.patch multitail.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Mar-2007 19:44:20
Branch: HEAD Handle: 2007032018442000
Modified files:
openpkg-src/multitail multitail.patch multitail.spec
Log:
upgrading package: multitail 4.2.0 -> 4.3.4
Summary:
RevisionChanges Path
1.5 +7 -6 openpkg-src/multitail/multitail.patch
1.97+3 -3 openpkg-src/multitail/multitail.spec
patch -p0 <<'@@ .'
Index: openpkg-src/multitail/multitail.patch
$ cvs diff -u -r1.4 -r1.5 multitail.patch
--- openpkg-src/multitail/multitail.patch 8 Sep 2006 15:31:16 -
1.4
+++ openpkg-src/multitail/multitail.patch 20 Mar 2007 18:44:20 -
1.5
@@ -1,15 +1,16 @@
Index: Makefile
Makefile.orig2006-09-08 10:38:28 +0200
-+++ Makefile 2006-09-08 17:30:21 +0200
-@@ -3,9 +3,8 @@
+--- Makefile.orig2007-03-20 13:56:44 +0100
Makefile 2007-03-20 19:41:48 +0100
+@@ -3,10 +3,8 @@
DESTDIR=/
CONFIG_FILE=$(DESTDIR)/etc/multitail.conf
--DEBUG=-g #-pg # -D_DEBUG -W -pedantic # -pg #-fprofile-arcs
--LDFLAGS+=-lpanel -lncurses -lutil -lm $(DEBUG)
+-DEBUG=-g # -pg # -D_DEBUG #-pg -W -pedantic # -pg #-fprofile-arcs
+-LDFLAGS+=-lpanel -lncurses -lutil -lm $(DEBUG) -rdynamic
+-# LDFLAGS+=-lc_p -lpanel_g -lncurses_g -lutil -lm -pg -g -rdynamic
-CFLAGS+=-D`uname` -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
-DCONFIG_FILE=\"$(CONFIG_FILE)\"
+LDFLAGS = $(OPENPKG_LDFLAGS)
-+CFLAGS = $(OPENPKG_CFLAGS) -DVERSION=\"$(VERSION)\"
-DCONFIG_FILE=\"$(CONFIG_FILE)\"
++CFLAGS = $(OPENPKG_CFLAGS) -DVERSION=\"$(VERSION)\"
-DCONFIG_FILE=\"$(CONFIG_FILE)\" -D`uname`
OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o
selbox.o stripstring.o color.o misc.o ui.o exec.o diff.o config.o cmdline.o
globals.o
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/multitail/multitail.spec
$ cvs diff -u -r1.96 -r1.97 multitail.spec
--- openpkg-src/multitail/multitail.spec 1 Jan 2007 17:39:59 -
1.96
+++ openpkg-src/multitail/multitail.spec 20 Mar 2007 18:44:20 -
1.97
@@ -32,8 +32,8 @@
Class:BASE
Group:Terminal
License: GPL
-Version: 4.2.0
-Release: 20061013
+Version: 4.3.4
+Release: 20070320
# list of sources
Source0: http://www.vanheusden.com/multitail/multitail-%{version}.tgz
@@ -59,7 +59,7 @@
prog multitail = {
version = %{version}
url = http://www.vanheusden.com/multitail/download.html
-regex = multitail-(\d+\.[02468]\.\d+)\.tgz
+regex = multitail-(__VER__)\.tgz
}
%prep
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/nsd/ nsd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Mar-2007 18:26:41 Branch: HEAD Handle: 2007032017264000 Modified files: openpkg-src/nsd nsd.spec Log: upgrading package: nsd 3.0.4 -> 3.0.5 Summary: RevisionChanges Path 1.61+2 -2 openpkg-src/nsd/nsd.spec patch -p0 <<'@@ .' Index: openpkg-src/nsd/nsd.spec $ cvs diff -u -r1.60 -r1.61 nsd.spec --- openpkg-src/nsd/nsd.spec 18 Jan 2007 17:55:04 - 1.60 +++ openpkg-src/nsd/nsd.spec 20 Mar 2007 17:26:40 - 1.61 @@ -32,8 +32,8 @@ Class:PLUS Group:DNS License: GPL -Version: 3.0.4 -Release: 20070118 +Version: 3.0.5 +Release: 20070320 # package option %option with_fsl yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/milter-greylist/ milter-greylist.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Mar-2007 18:26:36 Branch: HEAD Handle: 2007032017263500 Modified files: openpkg-src/milter-greylist milter-greylist.spec Log: upgrading package: milter-greylist 3.1.6 -> 3.1.7 Summary: RevisionChanges Path 1.10+2 -2 openpkg-src/milter-greylist/milter-greylist.spec patch -p0 <<'@@ .' Index: openpkg-src/milter-greylist/milter-greylist.spec $ cvs diff -u -r1.9 -r1.10 milter-greylist.spec --- openpkg-src/milter-greylist/milter-greylist.spec 2 Mar 2007 09:31:40 - 1.9 +++ openpkg-src/milter-greylist/milter-greylist.spec 20 Mar 2007 17:26:35 - 1.10 @@ -32,8 +32,8 @@ Class:EVAL Group:Mail License: BSD -Version: 3.1.6 -Release: 20070302 +Version: 3.1.7 +Release: 20070320 # package options %option with_fsl yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/crossroads/ crossroads.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Mar-2007 18:26:34 Branch: HEAD Handle: 2007032017263300 Modified files: openpkg-src/crossroads crossroads.spec Log: upgrading package: crossroads 1.29 -> 1.30 Summary: RevisionChanges Path 1.33+2 -2 openpkg-src/crossroads/crossroads.spec patch -p0 <<'@@ .' Index: openpkg-src/crossroads/crossroads.spec $ cvs diff -u -r1.32 -r1.33 crossroads.spec --- openpkg-src/crossroads/crossroads.spec7 Mar 2007 15:51:17 - 1.32 +++ openpkg-src/crossroads/crossroads.spec20 Mar 2007 17:26:33 - 1.33 @@ -32,8 +32,8 @@ Class:EVAL Group:Network License: Open Source -Version: 1.29 -Release: 20070307 +Version: 1.30 +Release: 20070320 # package options %option with_fsl yes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/ant/ ant.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Mar-2007 18:26:31
Branch: HEAD Handle: 2007032017263100
Modified files:
openpkg-src/ant ant.spec
Log:
modifying package: ant-1.7.0 20061220 -> 20070320
Summary:
RevisionChanges Path
1.43+2 -2 openpkg-src/ant/ant.spec
patch -p0 <<'@@ .'
Index: openpkg-src/ant/ant.spec
$ cvs diff -u -r1.42 -r1.43 ant.spec
--- openpkg-src/ant/ant.spec 1 Jan 2007 17:36:31 - 1.42
+++ openpkg-src/ant/ant.spec 20 Mar 2007 17:26:31 - 1.43
@@ -24,7 +24,7 @@
# package version
%define V_ant 1.7.0
-%define V_junit 4.2
+%define V_junit 4.3
# package information
Name: ant
@@ -37,7 +37,7 @@
Group:Building
License: Apache Software License
Version: %{V_ant}
-Release: 20061220
+Release: 20070320
# package options
%option with_docs no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/data-timezone/ data-timezone.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Mar-2007 18:26:27
Branch: HEAD Handle: 2007032017262700
Modified files:
openpkg-src/data-timezone
data-timezone.spec
Log:
upgrading package: data-timezone 2007c -> 2007d
Summary:
RevisionChanges Path
1.18+2 -2 openpkg-src/data-timezone/data-timezone.spec
patch -p0 <<'@@ .'
Index: openpkg-src/data-timezone/data-timezone.spec
$ cvs diff -u -r1.17 -r1.18 data-timezone.spec
--- openpkg-src/data-timezone/data-timezone.spec 26 Feb 2007 16:17:26
- 1.17
+++ openpkg-src/data-timezone/data-timezone.spec 20 Mar 2007 17:26:27
- 1.18
@@ -32,8 +32,8 @@
Class:BASE
Group:Data
License: Open Source
-Version: 2007c
-Release: 20070226
+Version: 2007d
+Release: 20070320
# list of sources
Source0: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY uuid.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Mar-2007 13:50:59
Branch: HEAD Handle: 2007032012505800
Modified files:
openpkg-src/openpkg HISTORY uuid.sh
Log:
improve generation of UUID_PLATFORM by using a better (no longer IP
based) "discriminator" value
Summary:
RevisionChanges Path
1.439 +1 -0 openpkg-src/openpkg/HISTORY
1.11+11 -33 openpkg-src/openpkg/uuid.sh
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.438 -r1.439 HISTORY
--- openpkg-src/openpkg/HISTORY 20 Mar 2007 11:29:50 - 1.438
+++ openpkg-src/openpkg/HISTORY 20 Mar 2007 12:50:58 - 1.439
@@ -2,6 +2,7 @@
2007
+20070320 improve generation of UUID_PLATFORM by using a better (no longer IP
based) "discriminator" value
20070320 remove old support for never finished rcng
20070320 remove old backward compatibility from rc.func for OpenPKG 1.2's
opXXX functions
20070319 change "rc" to not check permissions for --print operations
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/uuid.sh
$ cvs diff -u -r1.10 -r1.11 uuid.sh
--- openpkg-src/openpkg/uuid.sh 1 Jan 2007 17:40:20 - 1.10
+++ openpkg-src/openpkg/uuid.sh 20 Mar 2007 12:50:58 - 1.11
@@ -29,6 +29,7 @@
mgrp="@l_mgrp@"
prog_rpm="$prefix/libexec/openpkg/rpm"
prog_shtool="$prefix/lib/openpkg/shtool"
+prog_miniperl="$prefix/lib/openpkg/miniperl"
prog_uuid="$prefix/lib/openpkg/uuid"
file_uuid="$prefix/etc/openpkg/uuid"
@@ -62,34 +63,17 @@
eval `$prog_rpm --eval "$query" 2>/dev/null`
# query OS information
-Q_platform=`$prog_shtool platform --type=binary 2>/dev/null`
+Q_platform=`$prog_shtool platform --type=binary 2>/dev/null |\
+sed -e 's;^\([^-][^-]*-[^.-][^.-]*\)\..*$;\1;'`
if [ ".$Q_platform" = . ]; then
Q_platform="unknown"
fi
-Q_hostname=`$prog_shtool echo -e '%h%d' 2>/dev/null`
-if [ ".$Q_hostname" = . ]; then
-Q_hostname="unknown"
-fi
-Q_ipaddr=""
-ifconfig=`$prog_shtool path -p "/sbin:/usr/sbin:/bin:/usr/bin:$PATH"
ifconfig`
-if [ ".$ifconfig" != . ]; then
-ips=`$ifconfig -a 2>&1 | grep 'inet' | \
- sed -e 's;inet6;inet;g' \
- -e 's;inet addr:;inet ;' \
- -e 's;^;X;' \
- -e 's;^X.*inet *\([^ ][^ ]*\).*$;\1;' \
- -e 's;^X.*;;' | \
- sort`
-for ip in $ips; do
-if [ ".$Q_ipaddr" = . ]; then
-Q_ipaddr="$ip"
-else
-Q_ipaddr="$Q_ipaddr,$ip"
-fi
-done
-fi
-if [ ".$Q_ipaddr" = . ]; then
-Q_ipaddr="unknown"
+Q_discriminator=`$prog_uuid -v1 | $prog_uuid -d -- - | awk
'/node:.*global unicast/ { printf("mac:%s", $2); }'`
+if [ ".$Q_discriminator" = . ]; then
+Q_discriminator=`$prog_miniperl -e 'if (-f "/etc/openpkg") {
printf("inode:%s", (stat("/etc/openpkg"))[1]); }' 2>/dev/null`
+if [ ".$Q_discriminator" = . ]; then
+Q_discriminator=`$prog_shtool echo -e 'fqdn:%h%d' 2>/dev/null`
+fi
fi
}
@@ -221,8 +205,7 @@
# update platform UUID
name="${Q_platform}"
-name="$name:${Q_hostname}"
-name="$name:${Q_ipaddr}"
+name="$name:${Q_discriminator}"
if [ ".$opt_v" = .yes ]; then
echo "uuid: querying OpenPKG Platform OID"
echo "uuid: << $prog_rpm --eval '%{l_openpkg_oid_platform}'"
@@ -282,12 +265,7 @@
echo ""
echo "OpenPKG Platform"
echo "Platform Id: $Q_platform"
-echo "Host Name: $Q_hostname"
-n=1
-for ip in `echo "$Q_ipaddr" | sed -e 's;,; ;g'`; do
-echo . | awk '{ printf("Host IP Address %-6s %s\n", num, ip); }'
num="#$n" ip="$ip"
-n=`expr $n + 1`
-done
+echo "Discriminator: $Q_discriminator"
echo "UUID_PLATFORM: $UUID_PLATFORM"
echo ""
echo "(run \"$0 --verbose update\" to reproduce the UUID generation)"
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec rc rc.func
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Mar-2007 12:29:51
Branch: HEAD Handle: 2007032011295001
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rc rc.func
Log:
remove old code which is no longer required
Summary:
RevisionChanges Path
1.438 +2 -0 openpkg-src/openpkg/HISTORY
1.575 +1 -1 openpkg-src/openpkg/openpkg.spec
1.66+0 -6 openpkg-src/openpkg/rc
1.18+0 -36 openpkg-src/openpkg/rc.func
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.437 -r1.438 HISTORY
--- openpkg-src/openpkg/HISTORY 18 Mar 2007 23:56:28 - 1.437
+++ openpkg-src/openpkg/HISTORY 20 Mar 2007 11:29:50 - 1.438
@@ -2,6 +2,8 @@
2007
+20070320 remove old support for never finished rcng
+20070320 remove old backward compatibility from rc.func for OpenPKG 1.2's
opXXX functions
20070319 change "rc" to not check permissions for --print operations
20070319 fix eval "rc" in rc.func which relies on PATH and conflicts with
Plan 9 shell
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
$ cvs diff -u -r1.574 -r1.575 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 18 Mar 2007 23:42:17 - 1.574
+++ openpkg-src/openpkg/openpkg.spec 20 Mar 2007 11:29:50 - 1.575
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20070319
+%define V_openpkg 20070320
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
$ cvs diff -u -r1.65 -r1.66 rc
--- openpkg-src/openpkg/rc18 Mar 2007 23:56:28 - 1.65
+++ openpkg-src/openpkg/rc20 Mar 2007 11:29:50 - 1.66
@@ -48,12 +48,6 @@
NL="
"
-# provide hook for "openpkg-rc" package which contains the
-# new OSSP rc implementation as a replacement for this script.
-if [ -f "$prefix/lib/openpkg/rcng" ]; then
-exec "$prefix/lib/openpkg/rcng" ${1+"$@"}
-fi
-
##
## command line option parsing
##
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc.func
$ cvs diff -u -r1.17 -r1.18 rc.func
--- openpkg-src/openpkg/rc.func 18 Mar 2007 23:42:17 - 1.17
+++ openpkg-src/openpkg/rc.func 20 Mar 2007 11:29:51 - 1.18
@@ -208,39 +208,3 @@
esac
}
-#
-# BACKWARD COMPATIBILITY FOR OPENPKG 1.2 ONLY:
-# Mapping between old opXXX and new rcXXX functions.
-#
-
-opWarn () {
-rcMsg -w "$*"
-}
-opErr () {
-rcMsg -e "$*"
-}
-opPathAdd () {
-rcPath -a "$@"
-}
-opPathDel () {
-rcPath -r "$@"
-}
-opServiceEnabled () {
-rcService ${1} enable yes
-}
-opService () {
-rcService "$@"
-}
-opTmpDirGen () {
-rcTmp -i -p ${1}
-}
-opTmpDirFile () {
-eval "${3}=\$(rcTmp -f -n ${2})"
-}
-opTmpDirDel () {
-rcTmp -k
-}
-opVarIsYes () {
-rcVarIsYes "$@"
-}
-
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
