tags 418310 patch
thanks
I've prepared a 0-day NMU to fix this bug, which is the principal blocker
for removing php4 from lenny. The patch is attached, and the NMU will be on
its way to incoming shortly.
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
[EMAIL PROTECTED] http://www.debian.org/
diff -u ossp-uuid-1.5.1/debian/changelog ossp-uuid-1.5.1/debian/changelog
--- ossp-uuid-1.5.1/debian/changelog
+++ ossp-uuid-1.5.1/debian/changelog
@@ -1,3 +1,15 @@
+ossp-uuid (1.5.1-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload for RC bugfix.
+ * Drop php4-uuid, since php4 is obsolete and scheduled for removal from
+ testing. Closes: #418310.
+ * Fix the invocation of the php test to load uuid.so via a commandline
+ config directive, since we can't trust that the php5-cli package
+ supports dl().
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Sun, 21 Oct 2007 13:08:30 -0700
+
ossp-uuid (1.5.1-1) unstable; urgency=low
* New upstream release.
diff -u ossp-uuid-1.5.1/debian/rules ossp-uuid-1.5.1/debian/rules
--- ossp-uuid-1.5.1/debian/rules
+++ ossp-uuid-1.5.1/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# Generated automatically from debian/packages
-# by yada v0.51, of Thu, 16 Nov 2006
+# by yada v0.53, of Fri, 4 May 2007
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
@@ -146,23 +146,20 @@
echo -E '';\
echo -E 'pushd php';\
echo -E ' phpize5';\
- echo -E ' for php in 4 5; do';\
- echo -E ' mkdir build-php$$php';\
- echo -E ' pushd build-php$$php';\
- echo -E ' CC="$$CC" CFLAGS="$$CFLAGS -I../.. -L../.. -L../../.libs" \';\
- echo -E ' ../configure \';\
- echo -E ' --cache-file=../config.cache \';\
- echo -E ' --enable-uuid \';\
- echo -E ' --disable-static \';\
- echo -E ' --with-php-config=php-config$$php';\
- echo -E ' make';\
- echo -E ' popd';\
- echo -E ' LD_LIBRARY_PATH=`pwd`/../.libs \';\
- echo -E ' php$$php -q -d "safe_mode=0" -d "extension_dir=./build-php$$php" uuid.ts $$php';\
- echo -E ' done';\
+ echo -E ' mkdir build-php5';\
+ echo -E ' pushd build-php5';\
+ echo -E ' CC="$$CC" CFLAGS="$$CFLAGS -I../.. -L../.. -L../../.libs" \';\
+ echo -E ' ../configure \';\
+ echo -E ' --cache-file=../config.cache \';\
+ echo -E ' --enable-uuid \';\
+ echo -E ' --disable-static \';\
+ echo -E ' --with-php-config=php-config5';\
+ echo -E ' make';\
+ echo -E ' popd';\
+ echo -E ' LD_LIBRARY_PATH=`pwd`/../.libs \';\
+ echo -E ' php5 -q -d "safe_mode=0" -d "extension=modules/uuid.so" -d "extension_dir=./build-php5" uuid.ts 5';\
echo -E 'popd';\
echo -E '';\
- echo -E 'echo "php:php4-uuid:Depends=phpapi-`php-config4 --phpapi`" >> debian/substvars';\
echo -E 'echo "php:php5-uuid:Depends=phpapi-`php-config5 --phpapi`" >> debian/substvars') | /bin/bash
touch debian/build-stamp
@@ -183,7 +180,6 @@
debian/tmp-libossp-uuid-dev/DEBIAN/control \
debian/tmp-uuid/DEBIAN/control \
debian/tmp-libossp-uuid-perl/DEBIAN/control \
- debian/tmp-php4-uuid/DEBIAN/control \
debian/tmp-php5-uuid/DEBIAN/control
debian/tmp-libossp-uuid15/DEBIAN/control: debian/build-stamp debian/control
@@ -386,61 +382,6 @@
yada generate substvars libossp-uuid-perl
umask 022 && dpkg-gencontrol -isp -plibossp-uuid-perl -Pdebian/tmp-libossp-uuid-perl
-debian/tmp-php4-uuid/DEBIAN/control: debian/build-stamp debian/control
- rm -rf debian/tmp-php4-uuid
- umask 022 && install -d debian/tmp-php4-uuid/DEBIAN
- install -d debian/tmp-php4-uuid/usr/share/doc/php4-uuid
- umask 022; yada generate copyright \
- > debian/tmp-php4-uuid/usr/share/doc/php4-uuid/copyright
- install -m 644 -p debian/changelog \
- debian/tmp-php4-uuid/usr/share/doc/php4-uuid/changelog.Debian
- @umask 022 \
- && export pwd="$$(pwd)" \
- && export ROOT="$$(pwd)/debian/tmp-php4-uuid" \
- && export TMPROOT="$$(pwd)/debian/tmp" \
- && export CONTROL="$$(pwd)/debian/tmp-php4-uuid/DEBIAN" \
- && export PACKAGE="php4-uuid" \
- && export SOURCE="ossp-uuid" \
- && export VERSION="$(VERSION)" \
- && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
- && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
- && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
- && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
- && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
- && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
- echo -E 'eval "yada () { perl $$(which yada) \"[EMAIL PROTECTED]"; }"; set -e; set -v';\
- echo -E 'pushd php/build-php4';\
- echo -E ' make install INSTALL_ROOT=$$ROOT';\
- echo -E 'popd';\
- echo -E '';\
- echo -E 'chmod -x $$ROOT/usr/lib/php4/*/uuid.so';\
- echo -E 'chrpath $$ROOT/usr/lib/php4/*/uuid.so && \';\
- echo -E 'chrpath -d $$ROOT/usr/lib/php4/*/uuid.so';\
- echo -E '';\
- echo -E 'yada install -conf -subdir php4/conf.d debian/conf/uuid.ini') | /bin/bash
- @umask 022 \
- && export pwd="$$(pwd)" \
- && export ROOT="$$(pwd)/debian/tmp-php4-uuid" \
- && export TMPROOT="$$(pwd)/debian/tmp" \
- && export CONTROL="$$(pwd)/debian/tmp-php4-uuid/DEBIAN" \
- && export PACKAGE="php4-uuid" \
- && export SOURCE="ossp-uuid" \
- && export VERSION="$(VERSION)" && (\
- echo -E 'eval "yada () { perl $$(which yada) \"[EMAIL PROTECTED]"; }"; set -e; set -v';\
- echo -E 'yada perl';\
- echo -E 'yada python';\
- echo -E 'yada strip';\
- echo -E 'yada shlibdeps') | /bin/sh
- yada compress php4-uuid
- yada generate maintscripts php4-uuid
- find debian/tmp-php4-uuid -type f -print \
- | sed -n 's/^debian\/tmp-php4-uuid\(\/etc\/.*\)$$/\1/p' \
- > debian/tmp-php4-uuid/DEBIAN/conffiles
- test -s debian/tmp-php4-uuid/DEBIAN/conffiles || rm -f debian/tmp-php4-uuid/DEBIAN/conffiles
- yada rebuild control
- yada generate substvars php4-uuid
- umask 022 && dpkg-gencontrol -isp -pphp4-uuid -Pdebian/tmp-php4-uuid
-
debian/tmp-php5-uuid/DEBIAN/control: debian/build-stamp debian/control
rm -rf debian/tmp-php5-uuid
umask 022 && install -d debian/tmp-php5-uuid/DEBIAN
@@ -508,7 +449,6 @@
binary-package-libossp-uuid-dev \
binary-package-uuid \
binary-package-libossp-uuid-perl \
- binary-package-php4-uuid \
binary-package-php5-uuid
binary-indep:
@@ -552,16 +492,6 @@
fi
dpkg-deb --build debian/tmp-libossp-uuid-perl ..
-.PHONY: binary-package-php4-uuid
-binary-package-php4-uuid: check-root debian/tmp-php4-uuid/DEBIAN/control
- @[ -f $(shell which yada) -a -f debian/rules ]
- chown -R 0.0 debian/tmp-php4-uuid
- chmod -R u=rwX,go=rX debian/tmp-php4-uuid
- @if [ -d debian/tmp-php4-uuid/usr/doc/php4-uuid ]; then \
- echo "*** Yada warning: /usr/doc/php4-uuid should be /usr/share/doc/php4-uuid";\
- fi
- dpkg-deb --build debian/tmp-php4-uuid ..
-
.PHONY: binary-package-php5-uuid
binary-package-php5-uuid: check-root debian/tmp-php5-uuid/DEBIAN/control
@[ -f $(shell which yada) -a -f debian/rules ]
diff -u ossp-uuid-1.5.1/debian/packages ossp-uuid-1.5.1/debian/packages
--- ossp-uuid-1.5.1/debian/packages
+++ ossp-uuid-1.5.1/debian/packages
@@ -67,9 +67,9 @@
SUCH DAMAGE.
Build-Depends: libtool
Build-Depends: perl (>= 5.8), chrpath
-Build-Depends: php4-dev, php5-dev
+Build-Depends: php5-dev
%if %{without_no_test}
-Build-Depends: php4-cli, php5-cli
+Build-Depends: php5-cli
%endif
Patches: patches/*.patch
Major-Changes:
@@ -111,25 +111,22 @@
.
pushd php
phpize5
- for php in 4 5; do
- mkdir build-php$php
- pushd build-php$php
- CC="$CC" CFLAGS="$CFLAGS -I../.. -L../.. -L../../.libs" \
- ../configure \
- --cache-file=../config.cache \
- --enable-uuid \
- --disable-static \
- --with-php-config=php-config$php
- make
- popd
+ mkdir build-php5
+ pushd build-php5
+ CC="$CC" CFLAGS="$CFLAGS -I../.. -L../.. -L../../.libs" \
+ ../configure \
+ --cache-file=../config.cache \
+ --enable-uuid \
+ --disable-static \
+ --with-php-config=php-config5
+ make
+ popd
%if %{without_no_test}
- LD_LIBRARY_PATH=`pwd`/../.libs \
- php$php -q -d "safe_mode=0" -d "extension_dir=./build-php$php" uuid.ts $php
+ LD_LIBRARY_PATH=`pwd`/../.libs \
+ php5 -q -d "safe_mode=0" -d "extension=modules/uuid.so" -d "extension_dir=./build-php5" uuid.ts 5
%endif
- done
popd
.
- echo "php:php4-uuid:Depends=phpapi-`php-config4 --phpapi`" >> debian/substvars
echo "php:php5-uuid:Depends=phpapi-`php-config5 --phpapi`" >> debian/substvars
Clean: bash
pushd perl
@@ -204,23 +201,6 @@
chrpath $ROOT/usr/lib/perl5/auto/OSSP/uuid/uuid.so && \
chrpath -d $ROOT/usr/lib/perl5/auto/OSSP/uuid/uuid.so
-Package: php4-uuid
-Section: interpreters
-Architecture: any
-Description: OSSP uuid module for php4
- This package provides a module for OSSP uuid functions support in PHP
- scripts.
-Install: bash
- pushd php/build-php4
- make install INSTALL_ROOT=$ROOT
- popd
- .
- chmod -x $ROOT/usr/lib/php4/*/uuid.so
- chrpath $ROOT/usr/lib/php4/*/uuid.so && \
- chrpath -d $ROOT/usr/lib/php4/*/uuid.so
- .
- yada install -conf -subdir php4/conf.d debian/conf/uuid.ini
-
Package: php5-uuid
Section: interpreters
Architecture: any
diff -u ossp-uuid-1.5.1/debian/control ossp-uuid-1.5.1/debian/control
--- ossp-uuid-1.5.1/debian/control
+++ ossp-uuid-1.5.1/debian/control
@@ -3,10 +3,11 @@
Section: libs
Priority: optional
Standards-Version: 3.7.2
-Build-Depends: libtool, perl (>= 5.8), chrpath, php4-dev, php5-dev, php4-cli, php5-cli, yada (>= 0.51)
+Build-Depends: libtool, perl (>= 5.8), chrpath, php5-dev, php5-cli, yada (>= 0.53)
Package: libossp-uuid15
Architecture: any
+Depends: ${libossp-uuid15:Depends}
Suggests: uuid
Description: OSSP uuid ISO-C and C++ - shared library
OSSP uuid is an ISO-C and Perl application programming interface (API)
@@ -49,6 +50,7 @@
Package: uuid
Architecture: any
Section: utils
+Depends: ${uuid:Depends}
Conflicts: libossp-uuid11
Description: OSSP uuid
OSSP uuid is an ISO-C and Perl application programming interface (API)
@@ -70,6 +72,7 @@
Package: libossp-uuid-perl
Architecture: any
Section: perl
+Depends: ${libossp-uuid-perl:Depends}
Provides: libdata-uuid-perl
Conflicts: libdata-uuid-perl
Replaces: libdata-uuid-perl
@@ -99,30 +102,10 @@
The Debian package provides also Data::UUID interface so OSSP::uuid can be
used as free replacement for non-DFSG Perl module.
-Package: php4-uuid
-Architecture: any
-Section: interpreters
-Description: OSSP uuid module for php4
- OSSP uuid is an ISO-C and Perl application programming interface (API)
- and corresponding command line interface (CLI) for the generation of
- DCE 1.1 and ISO/IEC 11578:1996 compliant Universally Unique Identifier
- (UUID). It supports DCE 1.1 variant UUIDs of version 1 (time and node
- based), version 3 (name based) and version 4 (random number based).
- .
- UUIDs are 128 bit numbers which are intended to have a high likelihood
- of uniqueness over space and time and are computationally difficult
- to guess. They are globally unique identifiers which can be locally
- generated without contacting a global registration authority. UUIDs
- are intended as unique identifiers for both mass tagging objects
- with an extremely short lifetime and to reliably identifying very
- persistent objects across a network.
- .
- This package provides a module for OSSP uuid functions support in PHP
- scripts.
-
Package: php5-uuid
Architecture: any
Section: interpreters
+Depends: ${php5-uuid:Depends}
Description: OSSP uuid module for php5
OSSP uuid is an ISO-C and Perl application programming interface (API)
and corresponding command line interface (CLI) for the generation of
