OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Jun-2006 11:54:02
Branch: HEAD Handle: 2006061910540001
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec
Log:
revert to System V init style on Solaris 10 til SMF support gets
implemented correctly; downgrade cURL til build problems on Solaris
are fixed
Summary:
Revision Changes Path
1.337 +2 -0 openpkg-src/openpkg/HISTORY
1.490 +3 -93 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.336 -r1.337 HISTORY
--- openpkg-src/openpkg/HISTORY 18 Jun 2006 20:06:19 -0000 1.336
+++ openpkg-src/openpkg/HISTORY 19 Jun 2006 09:54:00 -0000 1.337
@@ -2,6 +2,8 @@
2006
====
+20060619 downgrade to cURL 7.15.3 til a suitable solution for long
line-capable 'grep -e' is found
+20060619 backout SMF and revert to classic System V init style on Solaris 10
due to complete brokenness
20060618 support bootstrap "Release:" tags for N-STABLE branches
("N.YYYMMDD")
20060618 support bootstrap "Release:" tags like YYYYMMDDxxxx for variants of
external parties
20060612 upgrade to cURL 7.15.4
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.489 -r1.490 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 18 Jun 2006 20:06:22 -0000 1.489
+++ openpkg-src/openpkg/openpkg.spec 19 Jun 2006 09:54:01 -0000 1.490
@@ -38,14 +38,14 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20060618
+%define V_openpkg 20060619
# the used software versions
%define V_rpm 4.2.1
%define V_zlib 1.2.3
%define V_bzip2 1.0.3
%define V_beecrypt 4.1.2
-%define V_curl 7.15.4
+%define V_curl 7.15.3
%define V_make 3.81
%define V_gzip 1.3.5
%define V_patch 2.5.9
@@ -180,6 +180,7 @@
}
prog openpkg:curl = {
version = %{V_curl}
+ comment = "cs: cURL 7.15.4 requires some grep(1) not found on
Solaris core installations"
url = http://curl.haxx.se/download/
regex = curl-(__VER__)\.tar\.gz
}
@@ -1944,91 +1945,6 @@
fi
fi
;;
- SunOS/5.10 )
- if [ ! -d /var/svc/manifest/openpkg ]; then
- mkdir /var/svc/manifest/openpkg
- fi
- if [ ! -f /var/svc/manifest/openpkg/${name}.xml ]; then
- # install SMF manifest
- ( echo "<?xml version=\"1.0\"?>"
- echo "<!DOCTYPE service_bundle SYSTEM
\"/usr/share/lib/xml/dtd/service_bundle.dtd.1\">"
- echo "<service_bundle type='manifest'
name='OpenPKG:${name}'>"
- echo " <service"
- echo " name='openpkg/${name}'"
- echo " type='service'"
- echo " version='1'>"
- echo " <single_instance />"
- echo " <dependency"
- echo " name='filesystem'"
- echo " type='service'"
- echo " grouping='require_all'"
- echo " restart_on='none'>"
- echo " <service_fmri
value='svc:/system/filesystem/local' />"
- echo " </dependency>"
- echo " <dependency"
- echo " name='name-services'"
- echo " type='service'"
- echo " grouping='require_all'"
- echo " restart_on='none'>"
- echo " <service_fmri
value='svc:/milestone/name-services' />"
- echo " </dependency>"
- echo " <dependency"
- echo " name='multi-user-server'"
- echo " type='service'"
- echo " grouping='require_all'"
- echo " restart_on='none'>"
- echo " <service_fmri
value='svc:/milestone/multi-user-server' />"
- echo " </dependency>"
- echo " <dependency"
- echo " name='network'"
- echo " type='service'"
- echo " grouping='require_all'"
- echo " restart_on='none'>"
- echo " <service_fmri
value='svc:/milestone/network' />"
- echo " </dependency>"
- echo " <exec_method"
- echo " type='method'"
- echo " name='start'"
- echo " exec='${prefix}/etc/rc all start'"
- echo " timeout_seconds='180'>"
- echo " <method_context>"
- echo " <method_credential user='root'
group='root' />"
- echo " </method_context>"
- echo " </exec_method>"
- echo " <exec_method"
- echo " type='method'"
- echo " name='stop'"
- echo " exec='${prefix}/etc/rc all stop'"
- echo " timeout_seconds='180'>"
- echo " </exec_method>"
- echo " <property_group name='startd'
type='framework'>"
- echo " <propval"
- echo " name='ignore_error'"
- echo " type='astring'"
- echo " value='core,signal' />"
- echo " </property_group>"
- echo " <property_group name='general'
type='framework'>"
- echo " <propval"
- echo " name='action_authorization'"
- echo " type='astring'"
- echo "
value='solaris.smf.manage.openpkg.${name}' />"
- echo " </property_group>"
- echo " <instance name='default' enabled='false'
/>"
- echo " <stability value='Unstable' />"
- echo " <template>"
- echo " <common_name>"
- echo " <loctext xml:lang='C'>OpenPKG
Instance ${prefix}</loctext>"
- echo " </common_name>"
- echo " </template>"
- echo " </service>"
- echo "</service_bundle>"
- ) >/var/svc/manifest/openpkg/${name}.xml
- chmod 644 /var/svc/manifest/openpkg/${name}.xml
- /usr/sbin/svccfg import
/var/svc/manifest/openpkg/${name}.xml
- ( echo "/usr/sbin/svcadm enable
\"svc:/openpkg/${name}:default\""
- ) >%{l_prefix}.pre-post-process.sh
- fi
- ;;
SunOS/5.* )
if [ ! -f /etc/init.d/${name} ]; then
# install transfer script
@@ -2638,12 +2554,6 @@
fi
fi
;;
- SunOS/5.10 )
- /usr/sbin/svcadm disable "svc:/openpkg/${name}:default";
sleep 2
- /usr/sbin/svccfg delete -f "svc:/openpkg/${name}:default"
>/dev/null 2>&1 || true
- rm -f /var/svc/manifest/openpkg/${name}.xml >/dev/null 2>&1
- rmdir /var/svc/manifest/openpkg >/dev/null 2>&1 || true
- ;;
SunOS/5.* )
rm -f /etc/init.d/${name} >/dev/null 2>&1
rm -f /etc/rc3.d/S99${name} >/dev/null 2>&1
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
