[csw-devel] SF.net SVN: gar:[20057] csw/mgar/pkg/openssh/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Tue Jan 8 22:51:00 CET 2013
Revision: 20057
http://gar.svn.sourceforge.net/gar/?rev=20057&view=rev
Author: chninkel
Date: 2013-01-08 21:50:59 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
openssh/trunk: renamed package from CSWossh to CSWopenssh
Modified Paths:
--------------
csw/mgar/pkg/openssh/trunk/Makefile
csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml
Added Paths:
-----------
csw/mgar/pkg/openssh/trunk/files/CSWopenssh.checkinstall
csw/mgar/pkg/openssh/trunk/files/CSWopensshlpk.checkinstall
Removed Paths:
-------------
csw/mgar/pkg/openssh/trunk/files/CSWossh.checkinstall
csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.checkinstall
Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile 2013-01-08 21:36:33 UTC (rev 20056)
+++ csw/mgar/pkg/openssh/trunk/Makefile 2013-01-08 21:50:59 UTC (rev 20057)
@@ -30,39 +30,43 @@
endef
-PACKAGES = CSWossh CSWosshclient
+PACKAGES = CSWopenssh CSWopensshclient
-CATALOGNAME_CSWossh = openssh
-SPKG_DESC_CSWossh = OpenSSH Secure Shell server
-RUNTIME_DEP_PKGS_CSWossh = CSWlibssl1-0-0 CSWlibwrap1 CSWlibz1 CSWlibkrb5-3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWosshclient
+CATALOGNAME_CSWopenssh = openssh
+SPKG_DESC_CSWopenssh = OpenSSH Secure Shell server
+RUNTIME_DEP_PKGS_CSWopenssh = CSWlibssl1-0-0 CSWlibwrap1 CSWlibz1 CSWlibkrb5-3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWopensshclient
-CATALOGNAME_CSWosshclient = openssh_client
-SPKG_DESC_CSWosshclient = OpenSSH Secure Shell client
-RUNTIME_DEP_PKGS_CSWosshclient = CSWlibssl1-0-0 CSWlibz1 CSWlibgssapi-krb5-2
+OBSOLETED_BY_CSWopenssh = CSWossh
+CATALOGNAME_CSWopensshclient = openssh_client
+SPKG_DESC_CSWopensshclient = OpenSSH Secure Shell client
+RUNTIME_DEP_PKGS_CSWopensshclient = CSWlibssl1-0-0 CSWlibz1 CSWlibgssapi-krb5-2
+
+OBSOLETED_BY_CSWopensshclient = CSWosshclient
+
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-PKGFILES_CSWossh = $(sbindir)/.*
-PKGFILES_CSWossh += $(docdir)/openssh/.*
-PKGFILES_CSWossh += $(mandir)/man5/sshd_config.5
-PKGFILES_CSWossh += $(mandir)/man8/sftp-server.8
-PKGFILES_CSWossh += $(mandir)/man8/sshd.8
-PKGFILES_CSWossh += $(libexecdir)/sftp-server
-PKGFILES_CSWossh += $(sysconfdir)/ssh/sshd_config.CSW
-PKGFILES_CSWossh += $(sysconfdir)/ssh/moduli.CSW
-PKGFILES_CSWossh += $(localstatedir)/empty
-PKGFILES_CSWossh += $(sysconfdir)/init.d/cswopenssh
-PKGFILES_CSWossh += $(localstatedir)/svc/manifest/network/cswopenssh.xml
-PKGFILES_CSWossh += $(prefix)/etc/pkg/CSWossh/cswusergroup
+PKGFILES_CSWopenssh = $(sbindir)/.*
+PKGFILES_CSWopenssh += $(docdir)/openssh/.*
+PKGFILES_CSWopenssh += $(mandir)/man5/sshd_config.5
+PKGFILES_CSWopenssh += $(mandir)/man8/sftp-server.8
+PKGFILES_CSWopenssh += $(mandir)/man8/sshd.8
+PKGFILES_CSWopenssh += $(libexecdir)/sftp-server
+PKGFILES_CSWopenssh += $(sysconfdir)/ssh/sshd_config.CSW
+PKGFILES_CSWopenssh += $(sysconfdir)/ssh/moduli.CSW
+PKGFILES_CSWopenssh += $(localstatedir)/empty
+PKGFILES_CSWopenssh += $(sysconfdir)/init.d/cswopenssh
+PKGFILES_CSWopenssh += $(localstatedir)/svc/manifest/network/cswopenssh.xml
+PKGFILES_CSWopenssh += $(prefix)/etc/pkg/CSWopenssh/cswusergroup
-PKGFILES_CSWosshclient = $(bindir)/.*
-PKGFILES_CSWosshclient += $(docdir)/openssh_client/.*
-PKGFILES_CSWosshclient += $(mandir)/man1/.*
-PKGFILES_CSWosshclient += $(mandir)/man5/ssh_config.5
-PKGFILES_CSWosshclient += $(mandir)/man8/ssh-keysign.8
-PKGFILES_CSWosshclient += $(libexecdir)/ssh-keysign
-PKGFILES_CSWosshclient += $(sysconfdir)/ssh/ssh_config.CSW
-PKGFILES_CSWosshclient += $(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED
+PKGFILES_CSWopensshclient = $(bindir)/.*
+PKGFILES_CSWopensshclient += $(docdir)/openssh_client/.*
+PKGFILES_CSWopensshclient += $(mandir)/man1/.*
+PKGFILES_CSWopensshclient += $(mandir)/man5/ssh_config.5
+PKGFILES_CSWopensshclient += $(mandir)/man8/ssh-keysign.8
+PKGFILES_CSWopensshclient += $(libexecdir)/ssh-keysign
+PKGFILES_CSWopensshclient += $(sysconfdir)/ssh/ssh_config.CSW
+PKGFILES_CSWopensshclient += $(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED
PROTOTYPE_MODIFIERS = setuid
PROTOTYPE_FILES_setuid = $(libexecdir)/ssh-keysign
@@ -72,30 +76,26 @@
PRESERVECONF += $(sysconfdir)/ssh/ssh_config
PRESERVECONF += $(sysconfdir)/ssh/moduli
INITSMF = $(sysconfdir)/init.d/cswopenssh
-USERGROUP = $(prefix)/etc/pkg/CSWossh/cswusergroup
+USERGROUP = $(prefix)/etc/pkg/CSWopenssh/cswusergroup
-MIGRATE_FILES_CSWossh = moduli sshd_config
-MIGRATE_FILES_CSWossh += ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key ssh_host_rsa_key.pub ssh_host_key ssh_host_key.pub
-MIGRATE_FILES_CSWossh += shosts.equiv
-MIGRATE_FILES_CSWossh += sshrc
-MIGRATE_FILES_CSWosshclient = ssh_config
-MIGRATE_FILES_CSWosshclient += ssh_known_hosts ssh_known_hosts2
-MIGRATE_FILES_CSWosshclient += ssh_prng_cmds
+MIGRATE_FILES_CSWopenssh = moduli sshd_config
+MIGRATE_FILES_CSWopenssh += ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key ssh_host_rsa_key.pub ssh_host_key ssh_host_key.pub
+MIGRATE_FILES_CSWopenssh += shosts.equiv
+MIGRATE_FILES_CSWopenssh += sshrc
+MIGRATE_FILES_CSWopensshclient = ssh_config
+MIGRATE_FILES_CSWopensshclient += ssh_known_hosts ssh_known_hosts2
+MIGRATE_FILES_CSWopensshclient += ssh_prng_cmds
MIGRATE_SOURCE_DIR = $(prefix)/etc/ssh
MIGRATE_DEST_DIR = $(sysconfdir)/ssh
-CHECKPKG_OVERRIDES_CSWosshclient += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh_client/INSTALL
-CHECKPKG_OVERRIDES_CSWossh += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh/INSTALL
-CHECKPKG_OVERRIDES_CSWossh += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswopenssh.xml
+CHECKPKG_OVERRIDES_CSWopensshclient += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh_client/INSTALL
+CHECKPKG_OVERRIDES_CSWopenssh += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh/INSTALL
+CHECKPKG_OVERRIDES_CSWopenssh += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswopenssh.xml
-CHECKPKG_OVERRIDES_CSWossh += surplus-dependency|CSWosshclient
+CHECKPKG_OVERRIDES_CSWopenssh += surplus-dependency|CSWopensshclient
-# We will not fix this today
-CHECKPKG_OVERRIDES_CSWossh += catalogname-does-not-match-pkgname|pkgname=CSWossh|catalogname=openssh|expected-catalogname=ossh
-CHECKPKG_OVERRIDES_CSWosshclient += catalogname-does-not-match-pkgname|pkgname=CSWosshclient|catalogname=openssh_client|expected-catalogname=osshclient
-
###### Upstream and OpenCSW files information #######
MASTER_SITES = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ http://www.sxw.org.uk/computing/patches/
@@ -105,8 +105,8 @@
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*p\d+).tar.gz
DISTFILES = $(NAME)-$(VERSION).tar.gz
-DISTFILES += CSWossh.checkinstall
-DISTFILES += CSWosshlpk.checkinstall
+DISTFILES += CSWopenssh.checkinstall
+DISTFILES += CSWopensshlpk.checkinstall
DISTFILES += changelog.CSW
DISTFILES += cswusergroup
@@ -170,17 +170,17 @@
# is the same with LPK enabled or not
DISTFILES += contrib-openssh-lpk-5.2p1-0.3.9.patch
ifdef LPK
- PACKAGES = CSWosshlpk
- CATALOGNAME_CSWosshlpk = openssh_lpk
- SPKG_DESC_CSWosshlpk = $(SPKG_DESC_CSWossh) with ldap public key support
- RUNTIME_DEP_PKGS_CSWosshlpk = $(RUNTIME_DEP_PKGS_CSWossh) CSWoldaprt
+ PACKAGES = CSWopensshlpk
+ CATALOGNAME_CSWopensshlpk = openssh_lpk
+ SPKG_DESC_CSWopensshlpk = $(SPKG_DESC_CSWopenssh) with ldap public key support
+ RUNTIME_DEP_PKGS_CSWopensshlpk = $(RUNTIME_DEP_PKGS_CSWopenssh) CSWoldaprt
MASTER_SITES += http://openssh-lpk.googlecode.com/svn/trunk/patch/contrib/
PATCHFILES += contrib-openssh-lpk-5.2p1-0.3.9.patch
CONFIGURE_ARGS += --with-ldap
DOCFILES += openssh-lpk_openldap.schema openssh-lpk_sun.schema lpk-user-example.txt README.lpk
- # we must reset the CSWosshclient description to avoid a bug in the automatic dependancy generation
- SPKG_DESC_CSWosshclient =
+ # we must reset the CSWopensshclient description to avoid a bug in the automatic dependancy generation
+ SPKG_DESC_CSWopensshclient =
endif
@@ -224,9 +224,9 @@
# we change some default value in the server config file
perl -pi -e 's,/etc/ssh/,$(sysconfdir)/ssh/,g; s,/usr/libexec/,/opt/csw/libexec/,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW"
perl -pi -e 's,^ *# *UsePAM *.*,UsePAM yes,g, s,^ *# *PrintMotd *.*,PrintMotd no,g; s,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW"
- ginstall -D "$(WORKDIR_FIRSTMOD)/cswusergroup" "$(PKGROOT)$(prefix)/etc/pkg/CSWossh/cswusergroup"
+ ginstall -D "$(WORKDIR_FIRSTMOD)/cswusergroup" "$(PKGROOT)$(prefix)/etc/pkg/CSWopenssh/cswusergroup"
ginstall -D "$(WORKDIR_FIRSTMOD)/THIS_LOCATION_IS_DEPRECATED" "$(PKGROOT)/$(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED"
merge-special-directories:
ginstall -d $(PKGROOT)$(localstatedir)/empty
- ginstall -d $(PKGROOT)$(sysconfdir)/pkg/CSWossh
+ ginstall -d $(PKGROOT)$(sysconfdir)/pkg/CSWopenssh
Copied: csw/mgar/pkg/openssh/trunk/files/CSWopenssh.checkinstall (from rev 20053, csw/mgar/pkg/openssh/trunk/files/CSWossh.checkinstall)
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWopenssh.checkinstall (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/CSWopenssh.checkinstall 2013-01-08 21:50:59 UTC (rev 20057)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+err=0
+
+if [ `uname -r` = "5.8" ] ; then
+
+if [ ! -c $PKG_ROOT_DIR/dev/random ] ; then
+ echo ERROR: /dev/random must exist
+ err=1
+fi
+
+if [ ! -c $PKG_ROOT_DIR/dev/urandom ] ; then
+ echo ERROR: /dev/urandom must exist
+ err=1
+fi
+
+fi
+
+if [ "$err" = "1" ] ; then
+ echo "For solaris 8 sparc, install patch 112438"
+ echo "For solaris 8 x86, install patch 112439"
+ exit 1
+fi
+
Copied: csw/mgar/pkg/openssh/trunk/files/CSWopensshlpk.checkinstall (from rev 20053, csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.checkinstall)
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWopensshlpk.checkinstall (rev 0)
+++ csw/mgar/pkg/openssh/trunk/files/CSWopensshlpk.checkinstall 2013-01-08 21:50:59 UTC (rev 20057)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+err=0
+
+if [ `uname -r` = "5.8" ] ; then
+
+if [ ! -c $PKG_ROOT_DIR/dev/random ] ; then
+ echo ERROR: /dev/random must exist
+ err=1
+fi
+
+if [ ! -c $PKG_ROOT_DIR/dev/urandom ] ; then
+ echo ERROR: /dev/urandom must exist
+ err=1
+fi
+
+fi
+
+if [ "$err" = "1" ] ; then
+ echo "For solaris 8 sparc, install patch 112438"
+ echo "For solaris 8 x86, install patch 112439"
+ exit 1
+fi
+
Deleted: csw/mgar/pkg/openssh/trunk/files/CSWossh.checkinstall
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.checkinstall 2013-01-08 21:36:33 UTC (rev 20056)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.checkinstall 2013-01-08 21:50:59 UTC (rev 20057)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-err=0
-
-if [ `uname -r` = "5.8" ] ; then
-
-if [ ! -c $PKG_ROOT_DIR/dev/random ] ; then
- echo ERROR: /dev/random must exist
- err=1
-fi
-
-if [ ! -c $PKG_ROOT_DIR/dev/urandom ] ; then
- echo ERROR: /dev/urandom must exist
- err=1
-fi
-
-fi
-
-if [ "$err" = "1" ] ; then
- echo "For solaris 8 sparc, install patch 112438"
- echo "For solaris 8 x86, install patch 112439"
- exit 1
-fi
-
Deleted: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.checkinstall
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.checkinstall 2013-01-08 21:36:33 UTC (rev 20056)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.checkinstall 2013-01-08 21:50:59 UTC (rev 20057)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-err=0
-
-if [ `uname -r` = "5.8" ] ; then
-
-if [ ! -c $PKG_ROOT_DIR/dev/random ] ; then
- echo ERROR: /dev/random must exist
- err=1
-fi
-
-if [ ! -c $PKG_ROOT_DIR/dev/urandom ] ; then
- echo ERROR: /dev/urandom must exist
- err=1
-fi
-
-fi
-
-if [ "$err" = "1" ] ; then
- echo "For solaris 8 sparc, install patch 112438"
- echo "For solaris 8 x86, install patch 112439"
- exit 1
-fi
-
Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml 2013-01-08 21:36:33 UTC (rev 20056)
+++ csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml 2013-01-08 21:50:59 UTC (rev 20057)
@@ -1,7 +1,7 @@
<?xml version='1.0'?>
<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
-<service_bundle type='manifest' name='CSWossh:openssh'>
+<service_bundle type='manifest' name='CSWopenssh:openssh'>
<service
name='network/cswopenssh'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list