Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
17036846 httping needs TPNO and license adjustments s11-update
authorRich Burridge <rich.burridge@oracle.com>
Wed, 03 Jul 2013 04:21:23 -0700
branchs11-update
changeset 2664 07a94f12f707
parent 2662 240ac3c3ac55
child 2667 24447a4555e5
17036846 httping needs TPNO and license adjustments
components/httping/httping.license file | annotate | diff | comparison | revisions
components/httping/httping.p5m file | annotate | diff | comparison | revisions 
--- a/components/httping/httping.license	Tue Jul 02 22:08:00 2013 -0700
+++ b/components/httping/httping.license	Wed Jul 03 04:21:23 2013 -0700
@@ -1,31 +1,12 @@
-Copyright (C) 2007 by [email protected]
-
-The GPL applies to this program. The license of this program
-can be obtained from: http://www.vanheusden.com/license.txt.
-It is actually the GNU Public License.
-
-  In addition, as a special exception, the copyright holders give
-  permission to link the code of portions of this program with the
-  OpenSSL library under certain conditions as described in each
-  individual source file, and distribute linked combinations
-  including the two.
-  You must obey the GNU General Public License in all respects
-  for all of the code used other than OpenSSL.  If you modify
-  file(s) with this exception, you may extend this exception to your
-  version of the file(s), but you are not obligated to do so.  If you
-  do not wish to do so, delete this exception statement from your
-  version.  If you delete this exception statement from all source
-  files in the program, then also delete it here.
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                        59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -75,7 +56,7 @@
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -274,7 +255,7 @@
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -296,5 +277,4 @@
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
+                     END OF TERMS AND CONDITIONS
--- a/components/httping/httping.p5m	Tue Jul 02 22:08:00 2013 -0700
+++ b/components/httping/httping.p5m	Wed Jul 03 04:21:23 2013 -0700
@@ -22,29 +22,22 @@
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-set name=pkg.fmri value=pkg:/diagnostic/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/diagnostic/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Ping for HTTP requests"
 set name=pkg.description \
-	value="Give httping an url, and it'll show you how long it takes to connect, send a request and retrieve the reply (only the headers)."
+    value="Give httping an url, and it'll show you how long it takes to connect, send a request and retrieve the reply (only the headers)."
 set name=com.oracle.info.description value="the HTTP ping utility"
-set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
+set name=com.oracle.info.tpno value=9238
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/118
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
-	value=PSARC/2009/118
-
-license httping.license license='GPLv2'
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/doc
-dir path=/usr/share/doc/httping
-dir path=usr/share/man
-dir path=usr/share/man/man1
 file path=usr/bin/httping
+file path=usr/share/doc/httping/license.OpenSSL
 file path=usr/share/doc/httping/license.txt
-file path=usr/share/doc/httping/license.OpenSSL
 file path=usr/share/doc/httping/readme.txt
 file path=usr/share/man/man1/httping.1
+license httping.license license=GPLv2
upstream/oracle/userland-gate