diff --git a/SOURCES/uuid-1.6.1-mkdir.patch b/SOURCES/uuid-1.6.1-mkdir.patch new file mode 100644 index 00000000..29fd76a2 --- /dev/null +++ b/SOURCES/uuid-1.6.1-mkdir.patch @@ -0,0 +1,11 @@ +diff -up uuid-1.6.2/pgsql/Makefile.mkdir uuid-1.6.2/pgsql/Makefile +--- uuid-1.6.2/pgsql/Makefile.mkdir 2011-03-03 15:12:12.000000000 +0000 ++++ uuid-1.6.2/pgsql/Makefile 2011-03-03 16:15:45.000000000 +0000 +@@ -16,6 +16,7 @@ PG_CONFIG ?= pg_config + PGXS := $(shell $(PG_CONFIG) --pgxs) + POSTGRES := $(shell $(PG_CONFIG) --bindir)/postgres + top_builddir := $(dir $(PGXS))../.. ++mkinstalldirs = ../shtool mkdir -p + include $(top_builddir)/src/Makefile.global + + NAME = ossp-uuid diff --git a/SOURCES/uuid-1.6.1-ossp.patch b/SOURCES/uuid-1.6.1-ossp.patch new file mode 100644 index 00000000..0703a167 --- /dev/null +++ b/SOURCES/uuid-1.6.1-ossp.patch @@ -0,0 +1,207 @@ +diff -up uuid-1.6.1/uuid-config.in.BAD uuid-1.6.1/uuid-config.in +--- uuid-1.6.1/uuid-config.in.BAD 2008-03-06 11:56:13.000000000 -0500 ++++ uuid-1.6.1/uuid-config.in 2008-03-06 11:56:25.000000000 -0500 +@@ -121,7 +121,7 @@ do + output_extra="$output_extra $uuid_ldflags" + ;; + --libs) +- output="$output -luuid" ++ output="$output -lossp-uuid" + output_extra="$output_extra $uuid_libs" + ;; + * ) +diff -up uuid-1.6.1/Makefile.in.BAD uuid-1.6.1/Makefile.in +--- uuid-1.6.1/Makefile.in.BAD 2008-03-06 11:10:13.000000000 -0500 ++++ uuid-1.6.1/Makefile.in 2008-03-06 11:11:39.000000000 -0500 +@@ -62,13 +62,13 @@ PERL = @PERL@ + PHP = @PHP@ + PG_CONFIG = @PG_CONFIG@ + +-LIB_NAME = libuuid.la ++LIB_NAME = libossp-uuid.la + LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo + +-DCE_NAME = libuuid_dce.la ++DCE_NAME = libossp-uuid_dce.la + DCE_OBJS = uuid_dce.lo $(LIB_OBJS) + +-CXX_NAME = libuuid++.la ++CXX_NAME = libossp-uuid++.la + CXX_OBJS = uuid++.lo $(LIB_OBJS) + + PRG_NAME = uuid +@@ -79,10 +79,10 @@ MAN_NAME = uuid.3 uuid++.3 uuid.1 + PERL_NAME = $(S)/perl/blib/lib/OSSP/uuid.pm + PERL_OBJS = $(S)/perl/uuid.pm + +-PHP_NAME = $(S)/php/modules/uuid.so ++PHP_NAME = $(S)/php/modules/ossp-uuid.so + PHP_OBJS = $(S)/php/uuid.c + +-PGSQL_NAME = $(S)/pgsql/libuuid.so ++PGSQL_NAME = $(S)/pgsql/libossp-uuid.so + PGSQL_OBJS = $(S)/pgsql/uuid.c + + TARGETS = $(LIB_NAME) @DCE_NAME@ @CXX_NAME@ $(PRG_NAME) @PERL_NAME@ @PHP_NAME@ @PGSQL_NAME@ +@@ -231,7 +231,7 @@ install: + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 + $(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/ + $(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/ +- $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ ++ $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc + $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/ + -@if [ ".$(WITH_DCE)" = .yes ]; then \ + echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \ +@@ -241,7 +241,7 @@ install: + echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \ + $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \ + fi +- $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ ++ $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ossp-uuid.3 + -@if [ ".$(WITH_CXX)" = .yes ]; then \ + echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \ + $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \ +@@ -276,7 +276,7 @@ uninstall: + -@if [ ".$(WITH_CXX)" = .yes ]; then \ + $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(CXX_NAME); \ + fi +- -$(RM) $(DESTDIR)$(mandir)/man3/uuid.3 ++ -$(RM) $(DESTDIR)$(mandir)/man3/ossp-uuid.3 + -@if [ ".$(WITH_CXX)" = .yes ]; then \ + echo "$(RM) $(DESTDIR)$(mandir)/man3/uuid++.3"; \ + $(RM) $(DESTDIR)$(mandir)/man3/uuid++.3; \ +@@ -290,7 +290,7 @@ uninstall: + echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \ + $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \ + fi +- -$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc ++ -$(RM) $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc + -$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1 + -$(RM) $(DESTDIR)$(bindir)/uuid-config + -$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE) +diff -up uuid-1.6.1/pgsql/Makefile.BAD uuid-1.6.1/pgsql/Makefile +--- uuid-1.6.1/pgsql/Makefile.BAD 2008-03-06 11:53:26.000000000 -0500 ++++ uuid-1.6.1/pgsql/Makefile 2008-03-06 11:54:14.000000000 -0500 +@@ -18,13 +18,13 @@ POSTGRES := $(shell $(PG_CONFIG + top_builddir := $(dir $(PGXS))../.. + include $(top_builddir)/src/Makefile.global + +-NAME = uuid ++NAME = ossp-uuid + OBJS = uuid.o + SO_MAJOR_VERSION = 1 + SO_MINOR_VERSION = 0 + + override CPPFLAGS := -I.. $(CPPFLAGS) +-SHLIB_LINK := -L../.libs -luuid ++SHLIB_LINK := -L../.libs -lossp-uuid + SHLIB_LINK += $(shell test $(shell uname -s) = FreeBSD && echo "-Wl,-Bsymbolic") + SHLIB_LINK += $(shell test $(shell uname -s) = Darwin && echo "-bundle_loader $(POSTGRES)") + rpath := +@@ -35,16 +35,16 @@ enable_shared = yes + include $(top_builddir)/src/Makefile.shlib + + uuid.sql: uuid.sql.in +- sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' uuid.sql ++ sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' uuid.sql + + install: all + $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(mkinstalldirs) $(DESTDIR)$(datadir) +- $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX) ++ $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX) + $(INSTALL_DATA) uuid.sql $(DESTDIR)$(datadir)/uuid.sql + + uninstall: +- -rm -f $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX) ++ -rm -f $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX) + -rm -f $(DESTDIR)$(datadir)/uuid.sql + + clean distclean: clean-lib +diff -up uuid-1.6.1/uuid.pc.in.BAD uuid-1.6.1/uuid.pc.in +--- uuid-1.6.1/uuid.pc.in.BAD 2008-03-06 11:57:29.000000000 -0500 ++++ uuid-1.6.1/uuid.pc.in 2008-03-06 11:57:36.000000000 -0500 +@@ -37,6 +37,6 @@ Description: Universally Unique Identifi + Version: @UUID_VERSION_RAW@ + URL: http://www.ossp.org/pkg/lib/uuid/ + Cflags: -I${includedir} +-Libs: -L${libdir} -luuid ++Libs: -L${libdir} -lossp-uuid + Libs.private: @LIBS@ + +diff -up uuid-1.6.1/perl/Makefile.PL.BAD uuid-1.6.1/perl/Makefile.PL +--- uuid-1.6.1/perl/Makefile.PL.BAD 2008-03-06 11:12:05.000000000 -0500 ++++ uuid-1.6.1/perl/Makefile.PL 2008-03-06 11:49:25.000000000 -0500 +@@ -33,9 +33,9 @@ use Config; + use ExtUtils::MakeMaker; + + # determine source directory +-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d } +- grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la")) +- or die "no source directory found (where libuuid.la is located)"; ++my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d } ++ grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la")) ++ or die "no source directory found (where libossp-uuid.la is located)"; + + # determine extra build options + my $compat = 0; +@@ -47,7 +47,7 @@ WriteMakefile( + VERSION_FROM => 'uuid.pm', + ABSTRACT_FROM => 'uuid.pod', + PREREQ_PM => {}, +- LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ], ++ LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ], + DEFINE => '', + INC => "-I. -I$srcdir", + PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm', +diff -up uuid-1.6.1/Makefile.PL.BAD uuid-1.6.1/Makefile.PL +--- uuid-1.6.1/Makefile.PL.BAD 2008-03-06 11:09:49.000000000 -0500 ++++ uuid-1.6.1/Makefile.PL 2008-03-06 11:10:01.000000000 -0500 +@@ -44,7 +44,7 @@ ARGS = $ARGS + all pure_all: + \@if [ ! -d build ]; then mkdir build; fi + \@if [ ! -f build/Makefile ]; then (cd build && ../configure --disable-shared); fi +- \@if [ ! -f build/libuuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libuuid.la); fi ++ \@if [ ! -f build/libossp-uuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libossp-uuid.la); fi + \@if [ ! -f perl/Makefile ]; then (cd perl && \$(PERL) Makefile.PL \$(ARGS)); fi + \@cd perl && \$(MAKE) \$(MFLAGS) \$\@ + +diff -up uuid-1.6.1/php/config.m4.BAD uuid-1.6.1/php/config.m4 +--- uuid-1.6.1/php/config.m4.BAD 2008-03-06 11:54:55.000000000 -0500 ++++ uuid-1.6.1/php/config.m4 2008-03-06 11:55:07.000000000 -0500 +@@ -34,7 +34,7 @@ if test "$PHP_UUID" != "no"; then + PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared) + AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library]) + PHP_ADD_LIBPATH([..], ) +- PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD) ++ PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD) + PHP_ADD_INCLUDE([..]) + PHP_SUBST(UUID_SHARED_LIBADD) + +diff -up uuid-1.6.1/php/Makefile.local.BAD uuid-1.6.1/php/Makefile.local +--- uuid-1.6.1/php/Makefile.local.BAD 2008-03-06 11:54:39.000000000 -0500 ++++ uuid-1.6.1/php/Makefile.local 2008-03-06 11:54:49.000000000 -0500 +@@ -48,7 +48,7 @@ install: build + @version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \ + echo "installing PHP$$version API into $$extdir"; \ + ./build/shtool mkdir -f -p -m 755 $(DESTDIR)$$extdir; \ +- ./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/uuid.so; \ ++ ./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/ossp-uuid.so; \ + ./build/shtool install -c -m 644 uuid.php$$version $(DESTDIR)$$extdir/uuid.php + + clean: +diff -up uuid-1.6.1/php/uuid.ts.BAD uuid-1.6.1/php/uuid.ts +--- uuid-1.6.1/php/uuid.ts.BAD 2008-03-06 11:55:38.000000000 -0500 ++++ uuid-1.6.1/php/uuid.ts 2008-03-06 11:56:03.000000000 -0500 +@@ -34,9 +34,9 @@ + + $php_version = $argv[1]; + +-print "++ loading DSO uuid.so (low-level API)\n"; ++print "++ loading DSO ossp-uuid.so (low-level API)\n"; + if (!extension_loaded('uuid')) { +- dl('modules/uuid.so'); ++ dl('modules/ossp-uuid.so'); + } + + print "++ loading PHP uuid.php${php_version} (high-level API)\n"; diff --git a/SOURCES/uuid-1.6.2-hwaddr.patch b/SOURCES/uuid-1.6.2-hwaddr.patch new file mode 100644 index 00000000..8975517e --- /dev/null +++ b/SOURCES/uuid-1.6.2-hwaddr.patch @@ -0,0 +1,115 @@ +diff -urN uuid-1.6.2/configure uuid-1.6.2/configure +--- uuid-1.6.2/configure 2008-07-04 15:43:09.000000000 -0600 ++++ uuid-1.6.2/configure 2012-06-06 19:19:41.659880386 -0600 +@@ -14208,7 +14208,7 @@ + + + +-for ac_header in netdb.h ifaddrs.h net/if.h net/if_dl.h net/if_arp.h netinet/in.h arpa/inet.h ++for ac_header in netdb.h ifaddrs.h net/if.h net/if_dl.h net/if_arp.h netinet/in.h arpa/inet.h netpacket/packet.h + do + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +diff -urN uuid-1.6.2/uuid.c uuid-1.6.2/uuid.c +--- uuid-1.6.2/uuid.c 2008-03-07 03:49:59.000000000 -0700 ++++ uuid-1.6.2/uuid.c 2012-06-06 15:50:30.060881473 -0600 +@@ -72,6 +72,8 @@ + /* IEEE 802 MAC address octet length */ + #define IEEE_MAC_OCTETS 6 + ++static unsigned char mac_unset[IEEE_MAC_OCTETS] = {BM_OCTET(1,0,0,0,0,0,0,0), 0x00, 0x00, 0x00, 0x00, 0x00}; ++ + /* UUID binary representation according to UUID standards */ + typedef struct { + uuid_uint32_t time_low; /* bits 0-31 of time field */ +@@ -967,7 +969,7 @@ + * GENERATE NODE + */ + +- if ((mode & UUID_MAKE_MC) || (uuid->mac[0] & BM_OCTET(1,0,0,0,0,0,0,0))) { ++ if ((mode & UUID_MAKE_MC) || !memcmp(uuid->mac, mac_unset, IEEE_MAC_OCTETS)) { + /* generate random IEEE 802 local multicast MAC address */ + if (prng_data(uuid->prng, (void *)&(uuid->obj.node), sizeof(uuid->obj.node)) != PRNG_RC_OK) + return UUID_RC_INT; +diff -urN uuid-1.6.2/uuid_mac.c uuid-1.6.2/uuid_mac.c +--- uuid-1.6.2/uuid_mac.c 2008-03-07 03:49:59.000000000 -0700 ++++ uuid-1.6.2/uuid_mac.c 2012-06-06 19:30:49.050879930 -0600 +@@ -76,6 +76,9 @@ + #ifdef HAVE_IFADDRS_H + #include + #endif ++#ifdef HAVE_NETPACKET_PACKET_H ++#include ++#endif + + /* own headers (part (1/2) */ + #include "uuid_mac.h" +@@ -87,6 +90,10 @@ + #define TRUE (/*lint -save -e506*/ !FALSE /*lint -restore*/) + #endif + ++#if !defined(min) ++#define min(a,b) ((a) < (b) ? (a) : (b)) ++#endif ++ + /* return the Media Access Control (MAC) address of + the FIRST network interface card (NIC) */ + int mac_address(unsigned char *data_ptr, size_t data_len) +@@ -95,28 +102,41 @@ + if (data_ptr == NULL || data_len < MAC_LEN) + return FALSE; + +-#if defined(HAVE_IFADDRS_H) && defined(HAVE_NET_IF_DL_H) && defined(HAVE_GETIFADDRS) ++#if defined(HAVE_IFADDRS_H) && (defined(HAVE_NET_IF_DL_H) || defined(HAVE_NETPACKET_PACKET_H)) && defined(HAVE_GETIFADDRS) + /* use getifaddrs(3) on BSD class platforms (xxxBSD, MacOS X, etc) */ + { + struct ifaddrs *ifap; + struct ifaddrs *ifap_head; ++#if defined(HAVE_NET_IF_DL_H) + const struct sockaddr_dl *sdl; + unsigned char *ucp; +- int i; ++#else ++ const struct sockaddr_ll *sll; ++#endif + + if (getifaddrs(&ifap_head) < 0) + return FALSE; + for (ifap = ifap_head; ifap != NULL; ifap = ifap->ifa_next) { ++#if defined(HAVE_NET_IF_DL_H) + if (ifap->ifa_addr != NULL && ifap->ifa_addr->sa_family == AF_LINK) { + sdl = (const struct sockaddr_dl *)(void *)ifap->ifa_addr; + ucp = (unsigned char *)(sdl->sdl_data + sdl->sdl_nlen); + if (sdl->sdl_alen > 0) { +- for (i = 0; i < MAC_LEN && i < sdl->sdl_alen; i++, ucp++) +- data_ptr[i] = (unsigned char)(*ucp & 0xff); ++ memcpy(data_ptr, ucp, min(sdl->sdl_alen, MAC_LEN)); + freeifaddrs(ifap_head); + return TRUE; + } + } ++#else ++ if (ifap->ifa_addr != NULL && ifap->ifa_addr->sa_family == AF_PACKET) { ++ sll = (const struct sockaddr_ll *)(void *)ifap->ifa_addr; ++ if (sll->sll_hatype == ARPHRD_ETHER) { ++ memcpy(data_ptr, sll->sll_addr, min(sll->sll_halen, MAC_LEN)); ++ freeifaddrs(ifap_head); ++ return TRUE; ++ } ++ } ++#endif + } + freeifaddrs(ifap_head); + } +diff -urN uuid-1.6.2/config.h.in uuid-1.6.2/config.h.in +--- uuid-1.6.2/config.h.in 2008-07-04 15:43:10.000000000 -0600 ++++ uuid-1.6.2/config.h.in 2012-06-06 21:59:03.370227352 -0600 +@@ -75,6 +75,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_NETINET_IN_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_NETPACKET_PACKET_H ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_NET_IF_ARP_H diff --git a/SOURCES/uuid-1.6.2-manfix.patch b/SOURCES/uuid-1.6.2-manfix.patch new file mode 100644 index 00000000..97322f57 --- /dev/null +++ b/SOURCES/uuid-1.6.2-manfix.patch @@ -0,0 +1,59 @@ +diff -up uuid-1.6.2/uuid.1.manfix uuid-1.6.2/uuid.1 +--- uuid-1.6.2/uuid.1.manfix 2008-07-04 23:43:23.000000000 +0200 ++++ uuid-1.6.2/uuid.1 2013-07-31 18:40:20.029657197 +0200 +@@ -138,7 +138,7 @@ + .if n .ad l + .nh + .SH "NAME" +-\&\fB\s-1OSSP\s0 uuid\fR \- \fBUniversally Unique Identifier Command-Line Tool\fR ++\&\fBuuid\fR \- \fBOSSP Universally Unique Identifier Command-Line Tool\fR + .SH "VERSION" + .IX Header "VERSION" + \&\s-1OSSP\s0 uuid \s-11.6.2 (04-Jul-2008)\s0 +diff -up uuid-1.6.2/uuid.3.manfix uuid-1.6.2/uuid.3 +--- uuid-1.6.2/uuid.3.manfix 2013-07-31 18:16:07.710415398 +0200 ++++ uuid-1.6.2/uuid.3 2013-07-31 18:38:49.528514078 +0200 +@@ -138,7 +138,7 @@ + .if n .ad l + .nh + .SH "NAME" +-\&\fB\s-1OSSP\s0 uuid\fR \- \fBUniversally Unique Identifier\fR ++\&\fBuuid\fR \- \fBOSSP Universally Unique Identifier\fR + .SH "VERSION" + .IX Header "VERSION" + \&\s-1OSSP\s0 uuid \s-11.6.2 (04-Jul-2008)\s0 +diff -up uuid-1.6.2/uuid++.3.manfix uuid-1.6.2/uuid++.3 +--- uuid-1.6.2/uuid++.3.manfix 2013-07-31 18:15:32.781746801 +0200 ++++ uuid-1.6.2/uuid++.3 2013-07-31 18:39:06.351354798 +0200 +@@ -138,7 +138,7 @@ + .if n .ad l + .nh + .SH "NAME" +-\&\fB\s-1OSSP\s0 uuid\fR \- \fBUniversally Unique Identifier\fR (\*(C+ \s-1API\s0) ++\&\fBuuid\fR \- \fBOSSP Universally Unique Identifier\fR (\*(C+ \s-1API\s0) + .SH "VERSION" + .IX Header "VERSION" + \&\s-1OSSP\s0 uuid \s-11.6.2 (04-Jul-2008)\s0 +diff -up uuid-1.6.2/uuid.pod.manfix uuid-1.6.2/uuid.pod +--- uuid-1.6.2/uuid.pod.manfix 2013-07-31 18:15:48.654596196 +0200 ++++ uuid-1.6.2/uuid.pod 2013-07-31 18:39:20.136224282 +0200 +@@ -31,7 +31,7 @@ + + =head1 NAME + +-B - B ++B - B + + =head1 VERSION + +diff -up uuid-1.6.2/uuid++.pod.manfix uuid-1.6.2/uuid++.pod +--- uuid-1.6.2/uuid++.pod.manfix 2013-07-31 18:14:38.503261796 +0200 ++++ uuid-1.6.2/uuid++.pod 2013-07-31 18:39:31.007121355 +0200 +@@ -31,7 +31,7 @@ + + =head1 NAME + +-B - B (C++ API) ++B - B (C++ API) + + =head1 VERSION diff --git a/SOURCES/uuid-1.6.2-multilibfix.patch b/SOURCES/uuid-1.6.2-multilibfix.patch new file mode 100644 index 00000000..a10f1d6f --- /dev/null +++ b/SOURCES/uuid-1.6.2-multilibfix.patch @@ -0,0 +1,12 @@ +diff -up uuid-1.6.2/pgsql/Makefile.multilibfix uuid-1.6.2/pgsql/Makefile +--- uuid-1.6.2/pgsql/Makefile.multilibfix 2013-06-03 18:04:55.000000000 +0200 ++++ uuid-1.6.2/pgsql/Makefile 2013-06-03 18:06:17.558717045 +0200 +@@ -36,7 +36,7 @@ enable_shared = yes + include $(top_builddir)/src/Makefile.shlib + + uuid.sql: uuid.sql.in +- sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' uuid.sql ++ sed -e 's;MODULE_PATHNAME;ossp-uuid$(DLSUFFIX);g' uuid.sql + + install: all + $(mkinstalldirs) $(DESTDIR)$(pkglibdir) diff --git a/SOURCES/uuid-1.6.2-nostrip.patch b/SOURCES/uuid-1.6.2-nostrip.patch new file mode 100644 index 00000000..c9609541 --- /dev/null +++ b/SOURCES/uuid-1.6.2-nostrip.patch @@ -0,0 +1,12 @@ +diff -up uuid-1.6.2/Makefile.in.nostrip uuid-1.6.2/Makefile.in +--- uuid-1.6.2/Makefile.in.nostrip 2012-06-19 12:53:47.888028956 +0200 ++++ uuid-1.6.2/Makefile.in 2012-06-19 12:53:47.913029142 +0200 +@@ -253,7 +253,7 @@ install: + -@if [ ".$(WITH_CXX)" = .yes ]; then \ + $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \ + fi +- @$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/ ++ @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 uuid $(DESTDIR)$(bindir)/ + $(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/ + -@if [ ".$(WITH_PERL)" = .yes ]; then \ + (cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \ diff --git a/SOURCES/uuid-1.6.2-php54.patch b/SOURCES/uuid-1.6.2-php54.patch new file mode 100644 index 00000000..74de3247 --- /dev/null +++ b/SOURCES/uuid-1.6.2-php54.patch @@ -0,0 +1,226 @@ +diff -up uuid-1.6.2/php/uuid.c.php54 uuid-1.6.2/php/uuid.c +--- uuid-1.6.2/php/uuid.c.php54 2007-01-01 19:35:57.000000000 +0100 ++++ uuid-1.6.2/php/uuid.c 2012-11-06 16:05:03.354913764 +0100 +@@ -60,7 +60,7 @@ static int ctx_id; /* inte + #define ctx_name "UUID context" /* external name */ + + /* module initialization */ +-PHP_MINIT_FUNCTION(uuid) ++ZEND_MINIT_FUNCTION(uuid) + { + /* register resource identifier */ + ctx_id = zend_register_list_destructors_ex( +@@ -91,13 +91,13 @@ PHP_MINIT_FUNCTION(uuid) + } + + /* module shutdown */ +-PHP_MSHUTDOWN_FUNCTION(uuid) ++ZEND_MSHUTDOWN_FUNCTION(uuid) + { + return SUCCESS; + } + + /* module information */ +-PHP_MINFO_FUNCTION(uuid) ++ZEND_MINFO_FUNCTION(uuid) + { + char version[32]; + +@@ -115,7 +115,7 @@ PHP_MINFO_FUNCTION(uuid) + proto rc uuid_create(ctx) + $rc = uuid_create(&$uuid); + create UUID context */ +-PHP_FUNCTION(uuid_create) ++ZEND_FUNCTION(uuid_create) + { + zval *z_ctx; + ctx_t *ctx; +@@ -147,7 +147,7 @@ PHP_FUNCTION(uuid_create) + proto rc uuid_destroy(ctx) + $rc = uuid_destroy($uuid); + destroy UUID context */ +-PHP_FUNCTION(uuid_destroy) ++ZEND_FUNCTION(uuid_destroy) + { + zval *z_ctx; + ctx_t *ctx; +@@ -178,7 +178,7 @@ PHP_FUNCTION(uuid_destroy) + proto rc uuid_clone(ctx, &ctx2) + $rc = uuid_clone($uuid, &$uuid); + clone UUID context */ +-PHP_FUNCTION(uuid_clone) ++ZEND_FUNCTION(uuid_clone) + { + zval *z_ctx; + ctx_t *ctx; +@@ -217,7 +217,7 @@ PHP_FUNCTION(uuid_clone) + proto rc uuid_load(ctx, name) + $rc = uuid_name($uuid, $name); + load an existing UUID */ +-PHP_FUNCTION(uuid_load) ++ZEND_FUNCTION(uuid_load) + { + zval *z_ctx; + ctx_t *ctx; +@@ -249,7 +249,7 @@ PHP_FUNCTION(uuid_load) + proto rc uuid_make(ctx, mode[, ..., ...]) + $rc = uuid_make($uuid, $mode[, ..., ...]); + make a new UUID */ +-PHP_FUNCTION(uuid_make) ++ZEND_FUNCTION(uuid_make) + { + zval *z_ctx; + ctx_t *ctx; +@@ -307,7 +307,7 @@ PHP_FUNCTION(uuid_make) + proto rc uuid_isnil(ctx, result) + $rc = uuid_isnil($uuid, &$result); + compare UUID for being Nil UUID */ +-PHP_FUNCTION(uuid_isnil) ++ZEND_FUNCTION(uuid_isnil) + { + zval *z_ctx; + ctx_t *ctx; +@@ -344,7 +344,7 @@ PHP_FUNCTION(uuid_isnil) + proto rc uuid_compare(ctx, ctx2, result) + $rc = uuid_compare($uuid, $uuid2, &$result); + compare two UUIDs */ +-PHP_FUNCTION(uuid_compare) ++ZEND_FUNCTION(uuid_compare) + { + zval *z_ctx; + ctx_t *ctx; +@@ -388,7 +388,7 @@ PHP_FUNCTION(uuid_compare) + proto rc uuid_import(ctx, fmt, data) + $rc = uuid_import($ctx, $fmt, $data); + import UUID from variable */ +-PHP_FUNCTION(uuid_import) ++ZEND_FUNCTION(uuid_import) + { + zval *z_ctx; + ctx_t *ctx; +@@ -424,7 +424,7 @@ PHP_FUNCTION(uuid_import) + proto rc uuid_export(ctx, fmt, data) + $rc = uuid_error($ctx, $fmt, &$data); + export UUID into variable */ +-PHP_FUNCTION(uuid_export) ++ZEND_FUNCTION(uuid_export) + { + zval *z_ctx; + ctx_t *ctx; +@@ -472,7 +472,7 @@ PHP_FUNCTION(uuid_export) + proto rc uuid_error(ctx) + $error = uuid_error($rc); + return error string corresponding to error return code */ +-PHP_FUNCTION(uuid_error) ++ZEND_FUNCTION(uuid_error) + { + int z_rc; + uuid_rc_t rc; +@@ -490,24 +490,79 @@ PHP_FUNCTION(uuid_error) + proto int uuid_version() + $version = uuid_version(); + return library version number */ +-PHP_FUNCTION(uuid_version) ++ZEND_FUNCTION(uuid_version) + { + RETURN_LONG((long)uuid_version()); + } + ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_create, 0) ++ ZEND_ARG_INFO(1, ctx) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_destroy, 0) ++ ZEND_ARG_INFO(0, ctx) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_clone, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(1, ctx2) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_load, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, name) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_uuid_make, 0, 0, 2) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, mode) ++ ZEND_ARG_INFO(0, ctxns) ++ ZEND_ARG_INFO(0, url) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_isnil, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(1, result) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_compare, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, ctx2) ++ ZEND_ARG_INFO(1, result) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_import, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, fmt) ++ ZEND_ARG_INFO(0, data) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_export, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, fmt) ++ ZEND_ARG_INFO(1, data) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_error, 0) ++ ZEND_ARG_INFO(0, ctx) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_version, 0) ++ZEND_END_ARG_INFO() ++ + /* module function table */ +-static function_entry uuid_functions[] = { +- PHP_FE(uuid_create, NULL) +- PHP_FE(uuid_destroy, NULL) +- PHP_FE(uuid_clone, NULL) +- PHP_FE(uuid_load, NULL) +- PHP_FE(uuid_make, NULL) +- PHP_FE(uuid_isnil, NULL) +- PHP_FE(uuid_compare, NULL) +- PHP_FE(uuid_import, NULL) +- PHP_FE(uuid_export, NULL) +- PHP_FE(uuid_error, NULL) +- PHP_FE(uuid_version, NULL) ++static zend_function_entry uuid_functions[] = { ++ ZEND_FE(uuid_create, arginfo_uuid_create) ++ ZEND_FE(uuid_destroy, NULL) ++ ZEND_FE(uuid_clone, arginfo_uuid_clone) ++ ZEND_FE(uuid_load, NULL) ++ ZEND_FE(uuid_make, NULL) ++ ZEND_FE(uuid_isnil, arginfo_uuid_isnil) ++ ZEND_FE(uuid_compare, arginfo_uuid_compare) ++ ZEND_FE(uuid_import, NULL) ++ ZEND_FE(uuid_export, arginfo_uuid_export) ++ ZEND_FE(uuid_error, NULL) ++ ZEND_FE(uuid_version, NULL) + { NULL, NULL, NULL } + }; + +@@ -516,11 +571,11 @@ zend_module_entry uuid_module_entry = { + STANDARD_MODULE_HEADER, + "uuid", + uuid_functions, +- PHP_MINIT(uuid), +- PHP_MSHUTDOWN(uuid), ++ ZEND_MINIT(uuid), ++ ZEND_MSHUTDOWN(uuid), + NULL, + NULL, +- PHP_MINFO(uuid), ++ ZEND_MINFO(uuid), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES + }; diff --git a/SOURCES/uuid-config-wrapper b/SOURCES/uuid-config-wrapper new file mode 100755 index 00000000..45e9d5f4 --- /dev/null +++ b/SOURCES/uuid-config-wrapper @@ -0,0 +1,21 @@ +#!/bin/sh +ARCH=32 +ARCH2=64 +LIBDIR1=/usr/lib +LIBDIR2=/usr/lib64 +LIBFILE=libossp-uuid.so +case $(uname -m) in + x86_64 | sparc64 | s390x | ppc64) + LIBDIR1=/usr/lib64 + LIBDIR2=/usr/lib + ARCH=64 + ARCH2=32 + ;; +esac +if [ ! -x "$LIBDIR1/$LIBFILE" ]; then + if [ ! -x "$LIBDIR2/$LIBFILE" ]; then + echo "Library not found: $LIBFILE" >&2 + else + ARCH=$ARCH2 + fi +fi diff --git a/SPECS/uuid.spec b/SPECS/uuid.spec new file mode 100644 index 00000000..53d6b6f9 --- /dev/null +++ b/SPECS/uuid.spec @@ -0,0 +1,435 @@ +%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) +%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) + +# Private libraries are not be exposed globally by RPM +%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$ + +#fix multilib - add wrapper and suffix to original files +%if %{_lib} == lib64 +%global mlsuffix 64 +%else +%global mlsuffix 32 +%endif + +Name: uuid +Version: 1.6.2 +Release: 26%{?dist} +Summary: Universally Unique Identifier library +License: MIT +Group: System Environment/Libraries +URL: http://www.ossp.org/pkg/lib/uuid/ +Source0: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz +Source1: uuid-config-wrapper +Patch0: uuid-1.6.1-ossp.patch +Patch1: uuid-1.6.1-mkdir.patch +Patch2: uuid-1.6.2-php54.patch + +# rhbz#829532 +Patch3: uuid-1.6.2-hwaddr.patch + +# do not strip binaries +Patch4: uuid-1.6.2-nostrip.patch +Patch5: uuid-1.6.2-manfix.patch +Patch6: uuid-1.6.2-multilibfix.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libtool + +Obsoletes: %{name}-pgsql < 1.6.2-24 + +%description +OSSP uuid is a ISO-C:1999 application programming interface (API) +and corresponding command line interface (CLI) for the generation +of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally +Unique Identifier (UUID). It supports DCE 1.1 variant UUIDs of version +1 (time and node based), version 3 (name based, MD5), version 4 +(random number based) and version 5 (name based, SHA-1). Additional +API bindings are provided for the languages ISO-C++:1998, Perl:5 and +PHP:4/5. Optional backward compatibility exists for the ISO-C DCE-1.1 +and Perl Data::UUID APIs. + +%package devel +Summary: Development support for Universally Unique Identifier library +Group: Development/Libraries +Requires: pkgconfig +Requires: %{name} = %{version}-%{release} + +%description devel +Development headers and libraries for OSSP uuid. + +%package c++ +Summary: C++ support for Universally Unique Identifier library +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description c++ +C++ libraries for OSSP uuid. + +%package c++-devel +Summary: C++ development support for Universally Unique Identifier library +Group: Development/Libraries +Requires: %{name}-c++ = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} + +%description c++-devel +C++ development headers and libraries for OSSP uuid. + +%package perl +Summary: Perl support for Universally Unique Identifier library +Group: Development/Libraries +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Test::More) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: %{name} = %{version}-%{release} + +%description perl +Perl OSSP uuid modules, which includes a Data::UUID replacement. + +%package php +Summary: PHP support for Universally Unique Identifier library +Group: Development/Libraries +BuildRequires: php-devel +Requires: %{name} = %{version}-%{release} +%if 0%{?php_zend_api:1} +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} +%else +Requires: php-api = %{php_apiver} +%endif + +%description php +PHP OSSP uuid module. + +%package dce +Summary: DCE support for Universally Unique Identifier library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description dce +DCE OSSP uuid library. + +%package dce-devel +Summary: DCE development support for Universally Unique Identifier library +Group: Development/Libraries +Requires: %{name}-dce = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} + +%description dce-devel +DCE development headers and libraries for OSSP uuid. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 -b .php54 +%patch3 -p1 -b .hwaddr +%patch4 -p1 -b .nostrip +%patch5 -p1 -b .manfix +%patch6 -p1 -b .multilibfix + +%build +# Build the library. +export LIB_NAME=libossp-uuid.la +export DCE_NAME=libossp-uuid_dce.la +export CXX_NAME=libossp-uuid++.la +export PHP_NAME=$(pwd)/php/modules/ossp-uuid.so +export PGSQL_NAME=$(pwd)/pgsql/libossp-uuid.so +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS" +%configure \ + --disable-static \ + --without-perl \ + --without-php \ + --with-dce \ + --with-cxx \ + --without-pgsql + +make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" %{?_smp_mflags} + +# Build the Perl module. +pushd perl +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" COMPAT=1 +%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile +make %{?_smp_mflags} +popd + +# Build the PHP module. +pushd php +export PHP_RPATH=no +phpize +CFLAGS="$RPM_OPT_FLAGS -I.. -L.. -L../.libs" +%configure --enable-uuid +make CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" %{?_smp_mflags} +popd + +%install +rm -rf $RPM_BUILD_ROOT + +make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/*.a +chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so.*.*.* + +# Install the Perl modules. +pushd perl +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT + +find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; + +%{_fixperms} $RPM_BUILD_ROOT/* +popd + +# Install the PHP module. +pushd php +make install INSTALL_ROOT=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{php_extdir}/*.a +popd + +# Put the php config bit into place +%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d +%{__cat} << __EOF__ > %{buildroot}%{_sysconfdir}/php.d/%{name}.ini +; Enable %{name} extension module +extension=%{name}.so +__EOF__ + +#multilib fix +mv $RPM_BUILD_ROOT/%{_bindir}/%{name}-config $RPM_BUILD_ROOT/%{_bindir}/%{name}-config.%{mlsuffix} +install %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/%{name}-config + +#%check +#make check + +#pushd perl +#LD_LIBRARY_PATH=../.libs make test +#popd + +#pushd php +#LD_LIBRARY_PATH=../.libs make test +#popd +## Simple extension load test (no test run in make test) +#LD_LIBRARY_PATH=.libs php -n -d extension_dir=php/modules -d extension=uuid.so -m | grep uuid + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%post c++ -p /sbin/ldconfig + +%post dce -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%postun c++ -p /sbin/ldconfig + +%postun dce -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS +%{_bindir}/uuid +%{_libdir}/libossp-uuid.so.* +%{_mandir}/man1/* +%exclude %{_mandir}/man1/uuid-config.* + +%files devel +%defattr(-,root,root,-) +%{_bindir}/uuid-config* +%{_includedir}/uuid.h +%{_libdir}/libossp-uuid.so +%{_libdir}/pkgconfig/ossp-uuid.pc +%{_mandir}/man3/ossp-uuid.3* +%{_mandir}/man1/uuid-config.* + +%files c++ +%defattr(-,root,root,-) +%{_libdir}/libossp-uuid++.so.* + +%files c++-devel +%defattr(-,root,root,-) +%{_includedir}/uuid++.hh +%{_libdir}/libossp-uuid++.so +%{_mandir}/man3/uuid++.3* + +%files perl +%defattr(-,root,root,-) +%{perl_vendorarch}/auto/* +%{perl_vendorarch}/Data* +%{perl_vendorarch}/OSSP* +%{_mandir}/man3/Data::UUID.3* +%{_mandir}/man3/OSSP::uuid.3* + +%files php +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini +%{php_extdir}/%{name}.so + +%files dce +%defattr(-,root,root,-) +%{_libdir}/libossp-uuid_dce.so.* + +%files dce-devel +%defattr(-,root,root,-) +%{_includedir}/uuid_dce.h +%{_libdir}/libossp-uuid_dce.so + +%changelog +* Fri Jan 24 2014 Daniel Mach - 1.6.2-26 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 1.6.2-25 +- Mass rebuild 2013-12-27 + +* Fri Nov 01 2013 Michal Hlavinka - 1.6.2-24 +- revert perl changes from last change + +* Wed Oct 30 2013 Michal Hlavinka - 1.6.2-23 +- drop uuid-pgsql subpackage, it is outdated and does not work, use + uuid-ossp module from postgresql-contrib instead + +* Mon Sep 02 2013 Michal Hlavinka - 1.6.2-21 +- rebuild after php abi change + +* Wed Jul 31 2013 Michal Hlavinka - 1.6.2-20 +- drop last man page change, that option is just for compatibility +- fix NAME section of man pages to be whatis friendly + +* Mon Jun 03 2013 Michal Hlavinka - 1.6.2-19 +- fix multilib issue + +* Thu May 30 2013 Michal Hlavinka - 1.6.2-18 +- describe -r in man page + +* Fri Mar 22 2013 Remi Collet - 1.6.2-17 +- rebuild for http://fedoraproject.org/wiki/Features/Php55 + +* Fri Feb 15 2013 Fedora Release Engineering - 1.6.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 06 2012 Michal Hlavinka - 1.6.2-15 +- make uuid-php compatible with php 5.4 (#873594) + +* Sun Jul 22 2012 Fedora Release Engineering - 1.6.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 28 2012 Petr Pisar - 1.6.2-13 +- Perl 5.16 rebuild + +* Tue Jun 19 2012 Michal Hlavinka - 1.6.2-12 +- enforce usage of our c(xx)flags + +* Tue Jun 19 2012 Michal Hlavinka - 1.6.2-11 +- fix debuginfo + +* Tue Jun 19 2012 Michal Hlavinka - 1.6.2-10 +- fix generation of MAC address based uuids (#829532), + patch by Philip Prindeville + +* Fri Jun 08 2012 Petr Pisar - 1.6.2-9 +- Perl 5.16 rebuild + +* Thu Jan 19 2012 Remi Collet - 1.6.2-8 +- build against php 5.4, with patch +- add filter_provides to avoid private-shared-object-provides shout.so +- add minimal %%check for php extension + +* Sat Jan 14 2012 Fedora Release Engineering - 1.6.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Jun 17 2011 Marcela Mašláňová - 1.6.2-6 +- Perl mass rebuild + +* Sat May 14 2011 Iain Arnell 1.6.2-5 +- fix php_zend_api check + +* Thu Mar 03 2011 Karsten Hopp 1.6.2-4 +- fix build + +* Mon Feb 07 2011 Fedora Release Engineering - 1.6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jun 02 2010 Marcela Maslanova - 1.6.2-2 +- Mass rebuild with perl-5.12.0 + +* Wed Apr 21 2010 Michal Hlavinka - 1.6.2-1 +- updated to 1.6.2 +- uuid-config man page moved to sub-package containing uuid-config (#562838) + +* Mon Feb 1 2010 Stepan Kasal - 1.6.1-10 +- silence rpmlint by using $(pwd) instead of shell variable RPM_SOURCE_DIR + +* Mon Dec 7 2009 Stepan Kasal - 1.6.1-9 +- rebuild against perl 5.10.1 + +* Sun Jul 26 2009 Fedora Release Engineering - 1.6.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Jul 13 2009 Remi Collet - 1.6.1-7 +- rebuild for new PHP 5.3.0 ABI (20090626) +- add PHP ABI check +- use php_extdir +- add php configuration file (/etc/php.d/uuid.ini) + +* Thu May 7 2009 Michael Schwendt - 1.6.1-6 +- Using plain old "Requires: pkgconfig" instead -- see my post to + fedora-devel-list made today. + +* Mon May 4 2009 Michael Schwendt - 1.6.1-5 +- Replace expensive %%{_libdir}/pkgconfig dependency in uuid-devel + with pkgconfig%%{_isa} for Fedora >= 11 (#484849). + +* Wed Feb 25 2009 Fedora Release Engineering - 1.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Mar 06 2008 Tom "spot" Callaway - 1.6.1-3 +- Rebuild for new perl + +* Thu Mar 6 2008 Tom "spot" Callaway - 1.6.1-2 +- forgot to cvs add patch + +* Thu Mar 6 2008 Tom "spot" Callaway - 1.6.1-1 +- 1.6.1 + +* Thu Mar 6 2008 Tom "spot" Callaway - 1.6.0-4 +- rebuild for new perl + +* Tue Feb 19 2008 Fedora Release Engineering - 1.6.0-3 +- Autorebuild for GCC 4.3 + +* Wed Aug 29 2007 Fedora Release Engineering - 1.6.0-2 +- Rebuild for selinux ppc32 issue. + +* Tue Jul 24 2007 Steven Pritchard 1.6.0-1 +- Update to 1.6.0. +- BR Test::More. + +* Tue Apr 17 2007 Steven Pritchard 1.5.1-3 +- Fix find option order. +- Use fixperms macro instead of our own chmod incantation. +- BR ExtUtils::MakeMaker. + +* Thu Oct 05 2006 Christian Iseli 1.5.1-2 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Mon Aug 28 2006 Steven Pritchard 1.5.1-1 +- Update to 1.5.1. + +* Sat Jul 29 2006 Steven Pritchard 1.5.0-1 +- Update to 1.5.0. +- Rename libuuid* to libossp-uuid*, uuid.3 to ossp-uuid.3, and uuid.pc + to ossp-uuid.pc to avoid conflicts with e2fsprogs-devel (#198520). +- Clean out the pgsql directory. (Some cruft shipped with this release.) + +* Wed May 24 2006 Steven Pritchard 1.4.2-4 +- Remove static php module. + +* Tue May 23 2006 Steven Pritchard 1.4.2-3 +- Force use of system libtool. +- Make libs executable. + +* Tue May 23 2006 Steven Pritchard 1.4.2-2 +- License is MIT(-ish). + +* Fri May 19 2006 Steven Pritchard 1.4.2-1 +- Initial packaging attempt.