[CVS] OpenPKG: openpkg-src/shtool/ shtool.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: 07-Feb-2006 09:39:53 Branch: HEAD Handle: 2006020708395300 Modified files: openpkg-src/shtool shtool.spec Log: upgrading package: shtool 2.0.4 - 2.0.5 Summary: RevisionChanges Path 1.38+2 -2 openpkg-src/shtool/shtool.spec patch -p0 '@@ .' Index: openpkg-src/shtool/shtool.spec $ cvs diff -u -r1.37 -r1.38 shtool.spec --- openpkg-src/shtool/shtool.spec4 Feb 2006 18:26:08 - 1.37 +++ openpkg-src/shtool/shtool.spec7 Feb 2006 08:39:53 - 1.38 @@ -32,8 +32,8 @@ Class:CORE Group:Development License: GPL -Version: 2.0.4 -Release: 20060204 +Version: 2.0.5 +Release: 20060207 # package options %option with_shtoolize yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/uuid/ uuid.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: 07-Feb-2006 09:49:51 Branch: HEAD Handle: 2006020708495100 Modified files: openpkg-src/uuiduuid.spec Log: upgrading package: uuid 1.4.0 - 1.4.1 Summary: RevisionChanges Path 1.33+2 -2 openpkg-src/uuid/uuid.spec patch -p0 '@@ .' Index: openpkg-src/uuid/uuid.spec $ cvs diff -u -r1.32 -r1.33 uuid.spec --- openpkg-src/uuid/uuid.spec15 Jan 2006 19:21:21 - 1.32 +++ openpkg-src/uuid/uuid.spec7 Feb 2006 08:49:51 - 1.33 @@ -32,8 +32,8 @@ Class:BASE Group:System License: MIT/X11-style -Version: 1.4.0 -Release: 20060115 +Version: 1.4.1 +Release: 20060207 # package options %option with_dce no @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.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: 07-Feb-2006 09:58:03 Branch: HEAD Handle: 2006020708580200 Modified files: openpkg-src/openpkg HISTORY openpkg.spec Log: upgrade to OSSP uuid 1.4.1 Summary: RevisionChanges Path 1.313 +1 -0 openpkg-src/openpkg/HISTORY 1.467 +1 -1 openpkg-src/openpkg/openpkg.spec patch -p0 '@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.312 -r1.313 HISTORY --- openpkg-src/openpkg/HISTORY 7 Feb 2006 08:43:07 - 1.312 +++ openpkg-src/openpkg/HISTORY 7 Feb 2006 08:58:02 - 1.313 @@ -2,6 +2,7 @@ 2005 +20060207 upgrade to OSSP uuid 1.4.1 20060207 upgrade to GNU shtool 2.0.5 20060206 upgrade to GNU config 20060206 20060204 upgrade to GNU shtool 2.0.4 @@ . patch -p0 '@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.466 -r1.467 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 7 Feb 2006 08:43:07 - 1.466 +++ openpkg-src/openpkg/openpkg.spec 7 Feb 2006 08:58:02 - 1.467 @@ -51,7 +51,7 @@ %define V_patch2.5.9 %define V_tar 1.15.1 %define V_bash 3.1 -%define V_uuid 1.4.0 +%define V_uuid 1.4.1 %define V_config 20060206 # package information @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-registry/ rpm.sh
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-registry Date: 07-Feb-2006 11:45:25 Branch: HEAD Handle: 2006020710452400 Modified files: openpkg-registryrpm.sh Log: typo Summary: RevisionChanges Path 1.6 +1 -1 openpkg-registry/rpm.sh patch -p0 '@@ .' Index: openpkg-registry/rpm.sh $ cvs diff -u -r1.5 -r1.6 rpm.sh --- openpkg-registry/rpm.sh 29 Nov 2005 16:35:18 - 1.5 +++ openpkg-registry/rpm.sh 7 Feb 2006 10:45:24 - 1.6 @@ -34,7 +34,7 @@ oldnanewbin=$PREFIX/lib/openpkg/rpm # old n/a, new binary rpm if [ -x $oldbinnewsh -a -x $oldnanewbin ]; then exec $oldnanewbin $@; fi -# determine wheter URL rewriting is active +# determine whether URL rewriting is active rewrite=0 $PREFIX/bin/openpkg register --printstatus /dev/null 21 rewrite=1 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/libgsasl/ libgsasl.patch libgsasl.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: 07-Feb-2006 19:13:54
Branch: HEAD Handle: 2006020718135400
Added files:
openpkg-src/libgsasllibgsasl.patch
Modified files:
openpkg-src/libgsasllibgsasl.spec
Log:
upgrading package: libgsasl 0.2.10 - 0.2.11
Summary:
RevisionChanges Path
1.1 +24 -0 openpkg-src/libgsasl/libgsasl.patch
1.14+2 -2 openpkg-src/libgsasl/libgsasl.spec
patch -p0 '@@ .'
Index: openpkg-src/libgsasl/libgsasl.patch
$ cvs diff -u -r0 -r1.1 libgsasl.patch
--- /dev/null 2006-02-07 19:13:53 +0100
+++ libgsasl.patch2006-02-07 19:13:54 +0100
@@ -0,0 +1,24 @@
+Index: gl/gc-libgcrypt.c
+--- gl/gc-libgcrypt.c.orig 2005-10-06 17:51:42 +0200
gl/gc-libgcrypt.c2005-10-08 09:34:00 +0200
+@@ -115,7 +115,7 @@
+ p = gcry_md_read (hd, GCRY_MD_MD5);
+ if (p == NULL)
+ {
+- gcry_md_close (mdh);
++ gcry_md_close (hd);
+ return GC_INVALID_HASH;
+ }
+
+Index: src/Makefile.in
+--- src/Makefile.in.orig 2005-10-07 15:56:15 +0200
src/Makefile.in 2005-10-08 09:35:38 +0200
+@@ -312,7 +312,7 @@
+ libgsasl_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -export-symbols-regex '^(gsasl|GSASL).*'
+
+-libgsasl_la_LIBADD = ../gl/libgl.la @LTLIBINTL@ @LTLIBIDN@ \
++libgsasl_la_LIBADD = ../gl/libgl.la @LTLIBINTL@ -lidn \
+ $(am__append_2) $(am__append_3) $(am__append_4) \
+ $(am__append_5) $(am__append_6) $(am__append_7) \
+ $(am__append_8) $(am__append_9) $(am__append_10) \
@@ .
patch -p0 '@@ .'
Index: openpkg-src/libgsasl/libgsasl.spec
$ cvs diff -u -r1.13 -r1.14 libgsasl.spec
--- openpkg-src/libgsasl/libgsasl.spec1 Jan 2006 13:15:43 -
1.13
+++ openpkg-src/libgsasl/libgsasl.spec7 Feb 2006 18:13:54 -
1.14
@@ -32,8 +32,8 @@
Class:EVAL
Group:Cryptography
License: LGPL
-Version: 0.2.10
-Release: 20051024
+Version: 0.2.11
+Release: 20060207
# list of sources
Source0: http://josefsson.org/gsasl/releases/libgsasl-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/libidn/ libidn.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: 07-Feb-2006 19:13:56
Branch: HEAD Handle: 2006020718135500
Modified files:
openpkg-src/libidn libidn.spec
Log:
upgrading package: libidn 0.6.1 - 0.6.2
Summary:
RevisionChanges Path
1.28+2 -2 openpkg-src/libidn/libidn.spec
patch -p0 '@@ .'
Index: openpkg-src/libidn/libidn.spec
$ cvs diff -u -r1.27 -r1.28 libidn.spec
--- openpkg-src/libidn/libidn.spec22 Jan 2006 17:19:55 - 1.27
+++ openpkg-src/libidn/libidn.spec7 Feb 2006 18:13:55 - 1.28
@@ -32,8 +32,8 @@
Class:BASE
Group:DNS
License: LGPL
-Version: 0.6.1
-Release: 20060122
+Version: 0.6.2
+Release: 20060207
# list of sources
Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/mico/ mico.patch mico.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: 07-Feb-2006 19:55:24
Branch: HEAD Handle: 2006020718552301
Modified files:
openpkg-src/micomico.spec
Removed files:
openpkg-src/micomico.patch
Log:
upgrading package: mico 2.3.11 - 2.3.12
Summary:
RevisionChanges Path
1.14+0 -2147 openpkg-src/mico/mico.patch
1.69+2 -4 openpkg-src/mico/mico.spec
rm -f openpkg-src/mico/mico.patch '@@ .'
Index: openpkg-src/mico/mico.patch
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 '@@ .'
Index: openpkg-src/mico/mico.spec
$ cvs diff -u -r1.68 -r1.69 mico.spec
--- openpkg-src/mico/mico.spec1 Jan 2006 13:16:42 - 1.68
+++ openpkg-src/mico/mico.spec7 Feb 2006 18:55:24 - 1.69
@@ -32,8 +32,8 @@
Class:PLUS
Group:System
License: LGPL/GPL
-Version: 2.3.11
-Release: 20050917
+Version: 2.3.12
+Release: 20060207
# package options
%option with_ssl no
@@ -45,7 +45,6 @@
# list of sources
Source0: http://www.mico.org/mico-%{version}.tar.gz
Source2: rc.mico
-Patch0: mico.patch
# build information
Prefix: %{l_prefix}
@@ -96,7 +95,6 @@
%prep
%setup -q -n mico
-%patch -p0
%build
CC=%{l_cc}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/dhtml/ dhtml.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: 07-Feb-2006 20:42:47
Branch: HEAD Handle: 2006020719424700
Modified files:
openpkg-src/dhtml dhtml.spec
Log:
add one additional cool JavaScript library
Summary:
RevisionChanges Path
1.19+14 -3 openpkg-src/dhtml/dhtml.spec
patch -p0 '@@ .'
Index: openpkg-src/dhtml/dhtml.spec
$ cvs diff -u -r1.18 -r1.19 dhtml.spec
--- openpkg-src/dhtml/dhtml.spec 4 Feb 2006 19:08:39 - 1.18
+++ openpkg-src/dhtml/dhtml.spec 7 Feb 2006 19:42:47 - 1.19
@@ -53,6 +53,7 @@
%define V_jsan_httpquery 0.03
%define V_jsan_csschange 0.02
%define V_jsan_display 0.06
+%define V_jsolait 2006-01-09
# package information
Name: dhtml
@@ -65,7 +66,7 @@
Group:Web
License: Open Source
Version: 20060204
-Release: 20060204
+Release: 20060207
# list of sources
Source0: http://prototype.conio.net/dist/prototype-%{V_prototype}.tar.gz
@@ -98,7 +99,8 @@
Source27:
http://openjsan.org/dist/t/th/theory/HTTP.Query-%{V_jsan_httpquery}.tar.gz
Source28:
http://openjsan.org/dist/t/ty/typester/CSS.Change-%{V_jsan_csschange}.tar.gz
Source29:
http://openjsan.org/dist/a/ad/adamk/Display-%{V_jsan_display}.tar.gz
-Source30: dhtml.txt
+Source30: http://jsolait.net/download/jsolait.%{V_jsolait}.small.zip
+Source31: dhtml.txt
# build information
Prefix: %{l_prefix}
@@ -264,6 +266,11 @@
url = http://openjsan.org/dist/a/ad/adamk/
regex = Display-(__VER__)\.tar\.gz
}
+prog dhtml:jsolait = {
+version = %{V_jsolait}
+url = http://jsolait.net/download/
+regex = jsolait\.(__VER__)\.small\.zip
+}
%prep
%setup -q -c
@@ -292,6 +299,7 @@
%setup -q -T -D -a 29
%{l_prefix}/bin/unzip -q -x %{SOURCE6}
%{l_prefix}/bin/unzip -q -x %{SOURCE9}
+%{l_prefix}/bin/unzip -q -x %{SOURCE30}
%build
@@ -316,7 +324,8 @@
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jsan/Function \
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jsan/HTTP \
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jsan/Widget \
-$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jsan/CSS
+$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jsan/CSS \
+$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jsolait
%{l_shtool} install -c -m 644 \
prototype-%{V_prototype}/dist/*.js \
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/prototype/
@@ -407,6 +416,8 @@
%{l_shtool} install -c -m 644 \
Display-%{V_jsan_display}/lib/*.js \
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jsan/
+cp -rp jsolait/* \
+$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jsolait/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/json/ json.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: 07-Feb-2006 21:08:21
Branch: HEAD Handle: 2006020720082100
Added files:
openpkg-src/jsonjson.spec
Log:
new package: json 20060207 (JavaScript Object Notation)
Summary:
RevisionChanges Path
1.1 +123 -0 openpkg-src/json/json.spec
patch -p0 '@@ .'
Index: openpkg-src/json/json.spec
$ cvs diff -u -r0 -r1.1 json.spec
--- /dev/null 2006-02-07 21:08:20 +0100
+++ json.spec 2006-02-07 21:08:21 +0100
@@ -0,0 +1,123 @@
+##
+## json.spec -- OpenPKG RPM Package Specification
+## Copyright (c) 2000-2006 OpenPKG Foundation e.V. http://openpkg.net/
+## Copyright (c) 2000-2006 Ralf S. Engelschall http://engelschall.com/
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package version
+%define V_api_c 0.5
+%define V_api_pl 1.03
+%define V_api_js 20060207
+%define V_draft 01
+
+# package information
+Name: json
+Summary: JavaScript Object Notation
+URL: http://www.json.org/
+Vendor: D. Crockford et al.
+Packager: OpenPKG
+Distribution: OpenPKG
+Class:EVAL
+Group:Language
+License: Open Source
+Version: 20060207
+Release: 20060207
+
+# list of sources
+Source0: http://oss.metaparadigm.com/json-c/json-c-%{V_api_c}.tar.gz
+Source1:
http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-%{V_api_pl}.tar.gz
+Source2:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json-%{V_api_js}.js
+Source3: http://www.json.org/draft-crockford-jsonorg-json-%{V_draft}.txt
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot:%{l_buildroot}
+BuildPreReq: OpenPKG, openpkg = 20040130, perl
+PreReq: OpenPKG, openpkg = 20040130, perl
+AutoReq: no
+AutoReqProv: no
+
+%description
+JSON (JavaScript Object Notation) is a lightweight data-interchange
+format. It is easy for humans to read and write. It is easy for
+machines to parse and generate. It is based on a subset of the
+JavaScript Programming Language, Standard ECMA-262 3rd Edition.
+JSON is a text format that is completely language independent but
+uses conventions that are familiar to programmers of the C-family
+of languages. These properties make JSON an ideal data-interchange
+language.
+
+%track
+prog json:json-c = {
+version = %{V_api_c}
+url = http://oss.metaparadigm.com/json-c/
+regex = json-c-(__VER__)\.tar\.gz
+}
+prog json:json-pl = {
+version = %{V_api_pl}
+url = http://www.cpan.org/authors/id/M/MA/MAKAMAKA/
+regex = JSON-(__VER__)\.tar\.gz
+}
+prog json:json-js = {
+version = %{V_api_js}
+url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/
+regex = json-(__VER__)\.js
+}
+
+%prep
+%setup -q -c
+%setup -q -T -D -a 1
+
+%build
+( cd json-c-%{V_api_c}
+ CC=%{l_cc} \
+ CFLAGS=%{l_cflags -O} \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --disable-shared
+ %{l_make} %{l_mflags -O}
+) || exit $?
+%{l_prefix}/bin/perl-openpkg prepare
+%{l_prefix}/bin/perl-openpkg -d JSON-%{V_api_pl} configure build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+( cd json-c-%{V_api_c}
+ %{l_make
[CVS] OpenPKG: openpkg-registry/ Makefile
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-registry Date: 07-Feb-2006 22:04:06
Branch: HEAD Handle: 2006020721040600
Modified files:
openpkg-registryMakefile
Log:
use make(1L) variable
Summary:
RevisionChanges Path
1.3 +1 -1 openpkg-registry/Makefile
patch -p0 '@@ .'
Index: openpkg-registry/Makefile
$ cvs diff -u -r1.2 -r1.3 Makefile
--- openpkg-registry/Makefile 24 Nov 2005 09:01:00 - 1.2
+++ openpkg-registry/Makefile 7 Feb 2006 21:04:06 - 1.3
@@ -33,7 +33,7 @@
@echo ++ changing distribution version; \
shtool version -l txt -n $(PACKAGE_DESC) -e $(VERSION_FILE); \
V=`shtool version -l txt -d short $(VERSION_FILE)`; \
- D=`shtool version -l txt -d long VERSION | sed -e 's;^.*(;;' -e
's;).*$$;;'`; \
+ D=`shtool version -l txt -d long $(VERSION_FILE) | sed -e 's;^.*(;;' -e
's;).*$$;;'`; \
shtool subst \
-e s/^progvers=\[^\]*\/progvers=\$${V}\/ \
-e s/^progdate=\[^\]*\/progdate=\$${D}\/ \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-registry/ Makefile
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-registry Date: 07-Feb-2006 22:07:45
Branch: HEAD Handle: 2006020721074500
Modified files:
openpkg-registryMakefile
Log:
cheat to bypass packaging during development
Summary:
RevisionChanges Path
1.4 +12 -0 openpkg-registry/Makefile
patch -p0 '@@ .'
Index: openpkg-registry/Makefile
$ cvs diff -u -r1.3 -r1.4 Makefile
--- openpkg-registry/Makefile 7 Feb 2006 21:04:06 - 1.3
+++ openpkg-registry/Makefile 7 Feb 2006 21:07:45 - 1.4
@@ -60,3 +60,15 @@
echo [...]; \
gunzip $(PACKAGE_NAME)-$${V}.tar.gz | tar tvf - | tail -10
+cheat:
+ @echo ++ exporting with ; \
+ V=`shtool version -l txt -d short $(VERSION_FILE)`; V=$$V+DEV; \
+ D=`date '+%Y%m%d%H%M%S'`; \
+ echo V=$$V D=$$D; \
+ shtool subst \
+ -e s/^my \\\$$progvers=\[^\]*\;/my
\\\$$progvers=\$${V}\;/ \
+ -e s/^my \\\$$progdate=\[^\]*\;/my
\\\$$progdate=\$${D}\;/ \
+ -e s;@l_prefix@;/v/openpkg/sw;g \
+ registry-ui.pl registry-ui-dev.cgi
+ scp registry-ui-dev.cgi [EMAIL
PROTECTED]:/v/openpkg/sw/cgi/openpkg-registry/
+
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-registry/ registry-ui.pl
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-registry Date: 07-Feb-2006 22:09:20
Branch: HEAD Handle: 2006020721091900
Modified files:
openpkg-registryregistry-ui.pl
Log:
implement and cleanup other authentication schemes; more robust
session handling
Summary:
RevisionChanges Path
1.51+81 -61 openpkg-registry/registry-ui.pl
patch -p0 '@@ .'
Index: openpkg-registry/registry-ui.pl
$ cvs diff -u -r1.50 -r1.51 registry-ui.pl
--- openpkg-registry/registry-ui.pl 29 Nov 2005 20:17:18 - 1.50
+++ openpkg-registry/registry-ui.pl 7 Feb 2006 21:09:19 - 1.51
@@ -87,8 +87,8 @@
# create objects
my $cgi = new CGI;
my $myurl = $cgi-url(-relative = 1) || .;
-my $requestedpage = $cgi-url_param(page);
-$requestedpage = $cfg-{page}-{default} if (not defined $requestedpage);
+my $sid = $cgi-cookie(registry-sid) || undef;
+my $requestedpage = $cgi-url_param(page) || $cfg-{page}-{default};
$cgi-delete(-name='page');
my $out = undef;
@@ -174,7 +174,7 @@
$session = undef;
CGI::Session-name(registry-sid);
$session = new CGI::Session(
-driver:sqlite;serializer:Storable;id:uuid, $cgi, { Handle = $dbs,
TableName = 'session' }
+driver:sqlite;serializer:Storable;id:uuid, $sid, { Handle = $dbs,
TableName = 'session' }
);
if (not defined $session) {
printprettyerror(Session handling failed, );
@@ -213,7 +213,7 @@
#
if($requestedpage eq login) {
$out = '';
-$out .= viewhttplogin(association);
+$out .= viewhttp();
$out .= viewhtmlhead(-menu);
$out .= viewlogin();
$out .= viewhtmltail();
@@ -221,7 +221,10 @@
}
elsif ($requestedpage eq logout) {
$out = '';
+$out .= viewhttp();
+$out .= viewhtmlhead(-menu);
$out .= viewlogout();
+$out .= viewhtmltail();
print STDOUT canvas($out);
}
elsif ($requestedpage eq asecomeback) {
@@ -328,30 +331,12 @@
$username = identifyusername();
if (not defined $username or $username eq '') {
if($cfg-{identification}-{mode} eq ase) {
-$header-{redirect} = $cgi-redirect(-uri = $ase-url(-action
= login, -mode_during = ase, -mode_after = association));
+$header-{redirect} = $cgi-redirect(-uri = $ase-url(-action
= login, -mode_during = ase, -mode_after = $page));
}
}
return $cgi-header($header);
}
-sub viewhttplogin($)
-{
-my ($page) = @_;
-my ($header, $username);
-
-$header = httpheader();
-
-$username = $cgi-param(username);
-$header-{cookie} = $cgi-cookie(
--name = 'username',
--value = $username,
--expires = '+3600s',
--path = '/'
-);
-$header-{redirect} = $cgi-redirect(?page=$page);
-return $cgi-header($header);
-}
-
sub viewhtmlhead (;$)
{
my ($menu) = @_;
@@ -360,6 +345,9 @@
$head .= html\n;
$head .= head\n;
$head .= link rel=\stylesheet\ type=\text/css\
href=\$myurl?page=css\/\n;
+if ($cfg-{identification}-{mode} eq ase) {
+$head .= $ase-canvas(-part = head) . \n;
+}
$head .= printjscheckallboxes();
$head .= /head\n;
$head .= body class=\registry\div class=\registry\\n;
@@ -377,44 +365,48 @@
$head .= /tr\n;
$head .= tr\n;
$head .= td colspan=\ . $td . \\n;
-$head .= prettyauthinfo;
+$head .= prettyauthinfo(fancy);
$head .= /td\n;
$head .= /tr\n;
$head .= /table\n;
}
-if ($cfg-{identification}-{mode} eq ase) {
-$head .= $ase-canvas(-part = head) . \n;
-}
return $head;
}
-sub prettyauthinfo ()
+sub prettyauthinfo ($)
{
-my ($html, $username);
-$html = ;
+my ($mode) = @_;
+my ($boldon, $boldoff, $text, $username);
+
+($boldon, $boldoff) = '';
+($boldon, $boldoff) = ('b', '/b') if ($mode eq 'fancy');
+
+$text = ;
+
$username = identifyusername();
if ($username ne ) {
-$html .= authenticated as b . $username . /b ;
+$text .= authenticated as . $boldon . $username . $boldoff;
}
else {
-$html .= you are bnot authenticated/b\n;
+$text .= you are . $boldon . not authenticated . $boldoff;
}
+
if
[CVS] OpenPKG: openpkg-src/dcron/ dcron.spec rc.dcron
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Bill Campbell
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Feb-2006 00:43:49
Branch: HEAD Handle: 2006020723434800
Modified files:
openpkg-src/dcron dcron.spec rc.dcron
Log:
Add logging and loglevel to config
Summary:
RevisionChanges Path
1.43+1 -1 openpkg-src/dcron/dcron.spec
1.13+16 -1 openpkg-src/dcron/rc.dcron
patch -p0 '@@ .'
Index: openpkg-src/dcron/dcron.spec
$ cvs diff -u -r1.42 -r1.43 dcron.spec
--- openpkg-src/dcron/dcron.spec 1 Jan 2006 13:13:00 - 1.42
+++ openpkg-src/dcron/dcron.spec 7 Feb 2006 23:43:48 - 1.43
@@ -37,7 +37,7 @@
Group:System
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20041011
+Release: 20060208
# list of sources
Source0:
http://apollo.backplane.com/FreeSrc/dcron%{V_major}%{V_minor}.tgz
@@ .
patch -p0 '@@ .'
Index: openpkg-src/dcron/rc.dcron
$ cvs diff -u -r1.12 -r1.13 rc.dcron
--- openpkg-src/dcron/rc.dcron20 Oct 2003 13:48:29 - 1.12
+++ openpkg-src/dcron/rc.dcron7 Feb 2006 23:43:48 - 1.13
@@ -5,6 +5,12 @@
%config
dcron_enable=$openpkg_rc_def
+dcron_loglevel=8
+dcron_log_prolog=true
+dcron_log_epilog=true
+dcron_log_numfiles=10
+dcron_log_minsize=1M
+dcron_log_complevel=9
%common
dcron_pidfile=@l_prefix@/var/dcron/dcron.pid
@@ -24,7 +30,7 @@
%start -u @l_susr@
rcService dcron enable yes || exit 0
rcService dcron active yes exit 0
-@l_prefix@/sbin/crond
+@l_prefix@/sbin/crond -l${dcron_loglevel}
@l_prefix@/var/dcron/dcron.log 21
%stop -u @l_susr@
rcService dcron enable yes || exit 0
@@ -39,3 +45,12 @@
sleep 2
rc dcron start
+%daily -u @l_susr@
+rcService dcron enable yes || exit 0
+shtool rotate -f \
+-n ${dcron_log_numfiles} -s ${dcron_log_minsize} -d \
+-z ${dcron_log_complevel} -o @l_musr@ -g @l_mgrp@ -m 644 \
+-P $dcron_log_prolog \
+-E $dcron_log_epilog rc dcron restart \
+@l_prefix@/var/dcron/dcron.log
+
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/nagios/ nagios.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: 08-Feb-2006 08:29:28
Branch: HEAD Handle: 2006020807292700
Modified files:
openpkg-src/nagios nagios.spec
Log:
upgrading package: nagios 1.3 - 2.0
Summary:
RevisionChanges Path
1.44+2 -2 openpkg-src/nagios/nagios.spec
patch -p0 '@@ .'
Index: openpkg-src/nagios/nagios.spec
$ cvs diff -u -r1.43 -r1.44 nagios.spec
--- openpkg-src/nagios/nagios.spec23 Jan 2006 13:34:11 - 1.43
+++ openpkg-src/nagios/nagios.spec8 Feb 2006 07:29:27 - 1.44
@@ -23,7 +23,7 @@
##
# package versions
-%define V_nagios 1.3
+%define V_nagios 2.0
%define V_nagios_plugins 1.4.2
# package information
@@ -37,7 +37,7 @@
Group:Network
License: GNU
Version: %{V_nagios}
-Release: 20060123
+Release: 20060208
# package options
%option with_eperl yes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/mysql/ mysql.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: 08-Feb-2006 08:29:32
Branch: HEAD Handle: 2006020807293200
Modified files:
openpkg-src/mysql mysql.spec
Log:
upgrading package: mysql 4.1.16 - 4.1.18
Summary:
RevisionChanges Path
1.139 +2 -2 openpkg-src/mysql/mysql.spec
patch -p0 '@@ .'
Index: openpkg-src/mysql/mysql.spec
$ cvs diff -u -r1.138 -r1.139 mysql.spec
--- openpkg-src/mysql/mysql.spec 1 Jan 2006 13:17:05 - 1.138
+++ openpkg-src/mysql/mysql.spec 8 Feb 2006 07:29:32 - 1.139
@@ -24,7 +24,7 @@
# package version
%define V_major 4.1
-%define V_minor 16
+%define V_minor 18
%define V_mysql %{V_major}.%{V_minor}
%define V_opkg%{V_major}.%{V_minor}
@@ -39,7 +39,7 @@
Group:Database
License: GPL
Version: %{V_opkg}
-Release: 20051214
+Release: 20060208
# package options
%option with_serveryes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openssh/ openssh.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: 08-Feb-2006 08:30:54
Branch: HEAD Handle: 2006020807305400
Modified files:
openpkg-src/openssh openssh.spec
Log:
add optional libedit support (for SFTP line editing)
Summary:
RevisionChanges Path
1.157 +9 -1 openpkg-src/openssh/openssh.spec
patch -p0 '@@ .'
Index: openpkg-src/openssh/openssh.spec
$ cvs diff -u -r1.156 -r1.157 openssh.spec
--- openpkg-src/openssh/openssh.spec 1 Feb 2006 18:49:18 - 1.156
+++ openpkg-src/openssh/openssh.spec 8 Feb 2006 07:30:54 - 1.157
@@ -43,7 +43,7 @@
Group:Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20060201
+Release: 20060208
# package options
%option with_fsl yes
@@ -58,6 +58,7 @@
%option with_wrap no
%option with_x11 no
%option with_trysetpath no
+%option with_libedit no
# list of sources
Source0:
ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -109,6 +110,10 @@
BuildPreReq: tcpwrappers
PreReq: tcpwrappers
%endif
+%if %{with_libedit} == yes
+BuildPreReq: libedit
+PreReq: libedit
+%endif
AutoReq: no
AutoReqProv: no
@@ -225,6 +230,9 @@
%if %{with_ldap} == yes
--with-ldap=%{l_prefix} \
%endif
+%if %{with_libedit} == yes
+--with-libedit=%{l_prefix} \
+%endif
--with-md5-passwords \
--with-zlib=%{l_prefix} \
--with-ipv4-default \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
