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.
20220349 Upgrade Apache Portable Runtime Utility (APR-util) to version 1.5.4
authorPetr Sumbera <petr.sumbera@oracle.com>
Tue, 16 Dec 2014 02:22:32 -0800
changeset 3554 ef58713bafc4
parent 3553 f1d133b09a8c
child 3555 76f4672c5e4b
20220349 Upgrade Apache Portable Runtime Utility (APR-util) to version 1.5.4
components/apr-util-1_5/Makefile file | annotate | diff | comparison | revisions
components/apr-util-1_5/apr-util-15.p5m file | annotate | diff | comparison | revisions
components/apr-util-1_5/apr-util.license file | annotate | diff | comparison | revisions 
--- a/components/apr-util-1_5/Makefile	Tue Dec 16 10:36:44 2014 -0500
+++ b/components/apr-util-1_5/Makefile	Tue Dec 16 02:22:32 2014 -0800
@@ -23,16 +23,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		apr-util
-COMPONENT_VERSION=	1.5.3
+COMPONENT_VERSION=	1.5.4
 COMPONENT_PROJECT_URL=	http://apr.apache.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743
+    sha256:976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/apr/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/apache
 
-TPNO=			6137
+TPNO=			20776
 
 CONFIGURE_DEFAULT_DIRS=no
 
@@ -40,6 +40,10 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+# Micro version for easy libraries packaging
+MICRO_VERSION:= $(shell echo $(COMPONENT_VERSION) | awk -F. '{ print $$3 }')
+PKG_MACROS+= MICRO_VERSION=$(MICRO_VERSION)
+
 PATCH_LEVEL=0
 
 CONFIGURE_PREFIX=/usr/apr-util/1.5
--- a/components/apr-util-1_5/apr-util-15.p5m	Tue Dec 16 10:36:44 2014 -0500
+++ b/components/apr-util-1_5/apr-util-15.p5m	Tue Dec 16 02:22:32 2014 -0800
@@ -71,17 +71,17 @@
 file path=usr/apr-util/1.5/include/apu_version.h
 file path=usr/apr-util/1.5/include/apu_want.h
 link path=usr/apr-util/1.5/lib/$(MACH64)/libaprutil-1.so \
-    target=libaprutil-1.so.0.5.3 facet.devel=false
+    target=libaprutil-1.so.0.5.$(MICRO_VERSION) facet.devel=false
 link path=usr/apr-util/1.5/lib/$(MACH64)/libaprutil-1.so.0 \
-    target=libaprutil-1.so.0.5.3 facet.devel=false
-file path=usr/apr-util/1.5/lib/$(MACH64)/libaprutil-1.so.0.5.3 facet.devel=false
+    target=libaprutil-1.so.0.5.$(MICRO_VERSION) facet.devel=false
+file path=usr/apr-util/1.5/lib/$(MACH64)/libaprutil-1.so.0.5.$(MICRO_VERSION) facet.devel=false
 file path=usr/apr-util/1.5/lib/$(MACH64)/pkgconfig/apr-util-1.pc
 link path=usr/apr-util/1.5/lib/64 target=$(MACH64)
-link path=usr/apr-util/1.5/lib/libaprutil-1.so target=libaprutil-1.so.0.5.3 \
+link path=usr/apr-util/1.5/lib/libaprutil-1.so target=libaprutil-1.so.0.5.$(MICRO_VERSION) \
     facet.devel=false
-link path=usr/apr-util/1.5/lib/libaprutil-1.so.0 target=libaprutil-1.so.0.5.3 \
+link path=usr/apr-util/1.5/lib/libaprutil-1.so.0 target=libaprutil-1.so.0.5.$(MICRO_VERSION) \
     facet.devel=false
-file path=usr/apr-util/1.5/lib/libaprutil-1.so.0.5.3 facet.devel=false
+file path=usr/apr-util/1.5/lib/libaprutil-1.so.0.5.$(MICRO_VERSION) facet.devel=false
 file path=usr/apr-util/1.5/lib/pkgconfig/apr-util-1.pc
 file path=usr/apr-util/1.5/manual/abts_8h_source.html
 file path=usr/apr-util/1.5/manual/abts__tests_8h_source.html
--- a/components/apr-util-1_5/apr-util.license	Tue Dec 16 10:36:44 2014 -0500
+++ b/components/apr-util-1_5/apr-util.license	Tue Dec 16 02:22:32 2014 -0800
@@ -1,7 +1,7 @@
 Apache Portable Runtime Utility Library
-Copyright (c) 2011 The Apache Software Foundation.
+Copyright (c) 2000-2014 The Apache Software Foundation.
 
-This product includes software developed by
+This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 Portions of this software were developed at the National Center
upstream/oracle/userland-gate