Revision: 14927
http://gar.svn.sourceforge.net/gar/?rev=14927&view=rev
Author: skayser
Date: 2011-06-28 21:05:30 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
autossh/trunk: add license file, update changelog, drop non-observable
AUTOSSH_PORT issue
Modified Paths:
--------------
csw/mgar/pkg/autossh/trunk/Makefile
csw/mgar/pkg/autossh/trunk/files/changelog.CSW
Modified: csw/mgar/pkg/autossh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autossh/trunk/Makefile 2011-06-28 17:52:35 UTC (rev 14926)
+++ csw/mgar/pkg/autossh/trunk/Makefile 2011-06-28 21:05:30 UTC (rev 14927)
@@ -1,12 +1,12 @@
# TODO (release-critical prefixed with !, non release-critical with *)
-# ! As soon as AUTOSSH_PORT is set, the invocation of autossh will
-# pass wrong options to ssh.
+#
# * man page doesn't properly format on Solaris. Upstream notified on
# 2009-06-24, intends to work on it, has access to his own Solaris
-# box. In case of a new upstream version, verify whether man page
+# box. In case of a upstream version >1.4b, verify whether man page
# formats properly (for now see install-preformatted-manpage: below).
# * DESTDIR and --with-ssh handling could be fixed. See the Debian
# patch tracker: http://patch-tracker.debian.org/package/autossh/1.4b-1
+#
NAME = autossh
VERSION = 1.4b
CATEGORIES = net
@@ -23,7 +23,7 @@
DISTFILES = $(NAME)-$(VERSION).tgz
TEST_SCRIPTS =
-INSTALL_SCRIPTS = custom preformatted-manpage
+INSTALL_SCRIPTS = custom preformatted-manpage extracted-license
CONFIGURE_ARGS = $(DIRPATHS)
NORUNPATH = 1
@@ -31,9 +31,6 @@
# --with-ssh=/usr/bin/ssh doesn't work -> checking for ssh... /opt/csw/bin/ssh
BUILD_ARGS = 'SSH=/usr/bin/ssh'
-# autossh doesn't ship a license and can't find one on $VENDOR_URL either
-CHECKPKG_OVERRIDES_CSWautossh += license-missing
-
include gar/category.mk
# Makefile install target doesn't honor $(DESTDIR) so we install manually
@@ -49,7 +46,6 @@
cp $(WORKSRC)/autossh $(DESTDIR)$(prefix)/libexec/autossh
cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST)
cp $(addprefix $(WORKSRC)/,autossh.host rscreen) $(DOCDEST)/examples
- cp $(FILEDIR)/changelog.CSW $(DOCDEST)
@$(MAKECOOKIE)
@@ -63,3 +59,18 @@
groff -m doc -Tascii -P-cuob $(WORKSRC)/autossh.1 > \
$(DESTDIR)$(mandir)/catman1/autossh.1
@$(MAKECOOKIE)
+
+# autossh doesn't ship with an explicit license file, thus we extract
+# the license that's given in the source code
+install-extracted-license: DOCDEST=$(DESTDIR)$(docdir)/$(NAME)
+install-extracted-license: assert-no-upstream-license
+ sed -n '/ \* Copyright/,/ \*\//p' $(WORKSRC)/autossh.c | \
+ sed 's, \*[ /]*,,' > $(DOCDEST)/license
+ @$(MAKECOOKIE)
+
+assert-no-upstream-license:
+ if [ -f $(WORKSRC)/$(LICENSE) ]; then \
+ echo "Target install-extracted-license is obsolete!"; \
+ exit 2; \
+ fi
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/autossh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/autossh/trunk/files/changelog.CSW 2011-06-28 17:52:35 UTC
(rev 14926)
+++ csw/mgar/pkg/autossh/trunk/files/changelog.CSW 2011-06-28 21:05:30 UTC
(rev 14927)
@@ -1,12 +1,13 @@
-autossh (1.4b,REV=2010.02.23)
+autossh (1.4b,REV=2011.06.28)
* Merged version suffix into package version. (Closes #4003)
+ * Added license file.
* Package now ships with a preformatted autossh.1 catman page so
that "man autossh" works with Solaris nroff.
- -- Sebastian Kayser <skay...@opencsw.org> Tue, 23 Feb 2010 21:01:41 +0100
+ -- Sebastian Kayser <skay...@opencsw.org> Tue, 28 Jun 2011 23:01:56 +0200
-autossh (1.4b,REV=2009.06.25)
+autossh (1.4,REV=2009.06.25_b)
* Initial release.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
