OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Sep-2003 14:20:25
Branch: HEAD Handle: 2003092813202202
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec platform rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen
openpkg-web news.txt
Log:
add partial UnixWare 7.1.x support to bootstrap; add IRIX, UnixWare
and QNX support to platform script
Summary:
Revision Changes Path
1.60 +1 -0 openpkg-src/openpkg/HISTORY
1.223 +34 -5 openpkg-src/openpkg/openpkg.spec
1.9 +48 -0 openpkg-src/openpkg/platform
1.24 +1 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.25 +1 -1 openpkg-src/openpkg/rpm.patch.feature
1.28 +20 -3 openpkg-src/openpkg/rpm.patch.porting
1.23 +1 -1 openpkg-src/openpkg/rpm.patch.regen
1.6771 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.59 -r1.60 HISTORY
--- openpkg-src/openpkg/HISTORY 27 Sep 2003 18:29:06 -0000 1.59
+++ openpkg-src/openpkg/HISTORY 28 Sep 2003 12:20:24 -0000 1.60
@@ -2,6 +2,7 @@
2003
====
+20030928 add partial UnixWare 7.1.x support to bootstrap; add IRIX, UnixWare and
QNX support to "platform"
20030927 make %{error:<msg>} really stop SPEC processing
20030927 add new macro %{l_openpkg_release} for expanding the release id
20030922 remove stale temporary files in /etc
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.222 -r1.223 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 27 Sep 2003 11:13:50 -0000 1.222
+++ openpkg-src/openpkg/openpkg.spec 28 Sep 2003 12:20:24 -0000 1.223
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030927
+%define V_openpkg 20030928
# the used software versions
%define V_rpm 4.2.1
@@ -1215,7 +1215,7 @@
entry="${usr}:*:${uid}:${gid}:${realname}:${prefix}:${shell}"
update="(PATH=\$PATH:/usr/sbin; pwconv)"
;;
- SunOS/5.* )
+ SunOS/5.* | UnixWare/* )
file=/etc/passwd
entry="${usr}:*:${uid}:${gid}:${realname}:${prefix}:${shell}"
update="(PATH=\$PATH:/usr/sbin; pwconv)"
@@ -1468,6 +1468,29 @@
) || exit $?
fi
;;
+ UnixWare/* )
+ if [ ! -f /etc/init.d/${name} ]; then
+ # install transfer script
+ ( echo "#!/bin/sh"
+ echo "##"
+ echo "## ${name} -- startup/shutdown transfer script for
OpenPKG ${prefix} hierarchy"
+ echo "##"
+ echo ""
+ echo "[ ! -f ${prefix}/etc/rc ] && exit 0"
+ echo "case \$1 in"
+ echo " start ) exec ${prefix}/etc/rc all start ;;"
+ echo " stop ) exec ${prefix}/etc/rc all stop ;;"
+ echo "esac"
+ ) >/etc/init.d/${name}
+ chmod 755 /etc/init.d/${name}
+ # create corresponding symbolic links
+ ( cd /etc
+ ln init.d/${name} rc2.d/S99${name}
+ ln init.d/${name} rc0.d/K00${name}
+ ln init.d/${name} rc1.d/K00${name}
+ ) || exit $?
+ fi
+ ;;
OSF1/V5.* )
if [ ! -f /sbin/init.d/${name} ]; then
# install transfer script
@@ -1584,7 +1607,7 @@
) >>/etc/crontab
fi
;;
- SunOS/5.* | OSF1/V5.* | NetBSD/* | HP-UX/* )
+ SunOS/5.* | OSF1/V5.* | NetBSD/* | HP-UX/* | UnixWare/* )
exists=`crontab -l | grep "$prefix/etc/rc"`
if [ ".$exists" = . ]; then
EDITOR=/tmp/vipw.$$
@@ -1737,7 +1760,7 @@
( PATH="$PATH:/usr/sbin"; pwd_mkdb -p /etc/master.passwd )
|| exit $?
rm -f /etc/master.passwd.bak >/dev/null 2>&1
;;
- Linux/* | SunOS/5.* )
+ Linux/* | SunOS/5.* | UnixWare/* )
cp /etc/passwd /etc/passwd.bak && \
grep -v "^${usr}:" /etc/passwd.bak >/etc/passwd
( PATH="$PATH:/usr/sbin"; pwconv ) || exit $?
@@ -1852,6 +1875,12 @@
rm -f /etc/rc0.d/K00${name} >/dev/null 2>&1
rm -f /etc/rc1.d/K00${name} >/dev/null 2>&1
;;
+ UnixWare/* )
+ rm -f /etc/init.d/${name} >/dev/null 2>&1
+ rm -f /etc/rc2.d/S99${name} >/dev/null 2>&1
+ rm -f /etc/rc0.d/K00${name} >/dev/null 2>&1
+ rm -f /etc/rc1.d/K00${name} >/dev/null 2>&1
+ ;;
OSF1/V5.* )
rm -f /sbin/init.d/${name} >/dev/null 2>&1
rm -f /sbin/rc3.d/S99${name} >/dev/null 2>&1
@@ -1888,7 +1917,7 @@
rm -f /etc/crontab.bak >/dev/null 2>&1
fi
;;
- SunOS/5.* | OSF1/V5.* | NetBSD/* | HP-UX/* )
+ SunOS/5.* | OSF1/V5.* | NetBSD/* | HP-UX/* | UnixWare/* )
EDITOR=/tmp/vipw.$$
VISUAL="$EDITOR"
export EDITOR
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/platform
============================================================================
$ cvs diff -u -r1.8 -r1.9 platform
--- openpkg-src/openpkg/platform 13 Sep 2003 20:22:05 -0000 1.8
+++ openpkg-src/openpkg/platform 28 Sep 2003 12:20:24 -0000 1.9
@@ -429,6 +429,54 @@
esac
;;
+ # SCO UnixWare
+ *:UnixWare:* )
+ # determine architecture
+ AT="${UNAME_MACHINE}"
+ case "${AT}" in
+ i[3-6]86 | ix86at ) AT="iX86" ;;
+ esac
+ AP="${AT}"
+ # determine system
+ v=`/sbin/uname -v`
+ ST="[SCO ]UnixWare ${v}"
+ SP="${ST}"
+ SC="SVR${UNAME_RELEASE}"
+ ;;
+
+ # QNX
+ *:QNX:* )
+ # determine architecture
+ AT="${UNAME_MACHINE}"
+ case "${AT}" in
+ x86pc ) AT="iX86" ;;
+ esac
+ AP="${AT}"
+ # determine system
+ v="${UNAME_RELEASE}"
+ ST="QNX[ Neutrino RTOS] ${v}"
+ v=`echo "${v}" | sed -e 's;^\([0-9][0-9]*\.[0-9][0-9]*\).*$;\1;'`
+ SP="QNX[ Neutrino RTOS] ${v}"
+ SC="QNX"
+ ;;
+
+ # SGI IRIX
+ *:IRIX*:* )
+ # determine architecture
+ AT="${UNAME_MACHINE}"
+ AP="${AT}"
+ case "${AP}:${UNAME_SYSTEM}" in
+ IP*:IRIX64 ) AP="MIPS64" ;;
+ IP*:* ) AP="MIPS" ;;
+ esac
+ AC="${AP}"
+ # determine system
+ v=`(/bin/uname -R || /bin/uname -r) 2>/dev/null | sed -e 's;[0-9.]* ;;'`
+ ST="[SGI ]IRIX ${v}"
+ v="${UNAME_RELEASE}"
+ SP="[SGI ]IRIX ${v}"
+ SC="BSD"
+ ;;
# TODO ...ADD YOUR NEW PLATFORM CHECK HERE... TODO
# *:XXX:* )
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.23 -r1.24 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 27 Sep 2003 18:29:07 -0000 1.23
+++ openpkg-src/openpkg/rpm.patch.bugfix 28 Sep 2003 12:20:24 -0000 1.24
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 27-Sep-2003
+## Created on: 28-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.24 -r1.25 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 27 Sep 2003 18:29:07 -0000 1.24
+++ openpkg-src/openpkg/rpm.patch.feature 28 Sep 2003 12:20:24 -0000 1.25
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 27-Sep-2003
+## Created on: 28-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.27 -r1.28 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 27 Sep 2003 18:29:07 -0000 1.27
+++ openpkg-src/openpkg/rpm.patch.porting 28 Sep 2003 12:20:24 -0000 1.28
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 27-Sep-2003
+## Created on: 28-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -260,10 +260,11 @@
+---------------------------------------------------------------------------
| Drop GCC "inline" attribute if not compiling with GCC.
+| Workaround some other GCC'isms, too.
+---------------------------------------------------------------------------
Index: file/system.h
--- file/system.h 24 Jan 2003 19:41:56 -0000 1.1.1.1
-+++ file/system.h 1 Sep 2003 08:59:40 -0000
++++ file/system.h 28 Sep 2003 10:45:59 -0000
@@ -246,7 +246,11 @@
*/
/[EMAIL PROTECTED]@*/
@@ -276,7 +277,23 @@
/[EMAIL PROTECTED] fileSystem @*/
/[EMAIL PROTECTED] fileSystem @*/
{
-@@ -314,9 +318,14 @@
+@@ -286,9 +290,15 @@
+
+ #if !defined(__LCLINT__)
+ /* Memory allocation via macro defs to get meaningful locations from mtrace() */
++#if defined(__GNUC__)
+ #define xmalloc(_size) (malloc(_size) ? : vmefail(0))
+ #define xcalloc(_nmemb, _size) (calloc((_nmemb), (_size)) ? : vmefail(0))
+ #define xrealloc(_ptr, _size) (realloc((_ptr), (_size)) ? : vmefail(0))
++#else
++#define xmalloc(_size) (malloc(_size) || vmefail(0))
++#define xcalloc(_nmemb, _size) (calloc((_nmemb), (_size)) || vmefail(0))
++#define xrealloc(_ptr, _size) (realloc((_ptr), (_size)) || vmefail(0))
++#endif
+ #define xstrdup(_str) (strcpy(xmalloc(strlen(_str)+1), (_str)))
+ #endif
+
+@@ -314,9 +324,14 @@
#if defined(__LCLINT__)
#define FILE_RCSID(id)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.22 -r1.23 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 27 Sep 2003 18:29:07 -0000 1.22
+++ openpkg-src/openpkg/rpm.patch.regen 28 Sep 2003 12:20:24 -0000 1.23
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 27-Sep-2003
+## Created on: 28-Sep-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6770 -r1.6771 news.txt
--- openpkg-web/news.txt 28 Sep 2003 09:52:07 -0000 1.6770
+++ openpkg-web/news.txt 28 Sep 2003 12:20:22 -0000 1.6771
@@ -1,3 +1,4 @@
+28-Sep-2003: Upgraded package: P<openpkg-20030928-20030928>
28-Sep-2003: Upgraded package: P<crm114-20030920-20030928>
28-Sep-2003: Upgraded package: P<perl-poe-20030928-20030928>
28-Sep-2003: Upgraded package: P<vim-6.2.106-20030928>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
