Bug#359245: explanation for patch
Hi You can delete the rpath in the package by adding the following patch to your rules. Please try to bring it into upstream tarball by explaining it to the author. --- ../rules.orig 2006-04-29 18:58:12.0 +0200 +++ debian/rules2006-04-29 19:01:27.0 +0200 @@ -22,6 +22,7 @@ # after the directories are created but before dh_compress is run. common-binary-post-install-arch:: dh_buildinfo + chrpath -d $(CURDIR)/debian/php4-syck/usr/lib/php5/20051025/syck.so build/python2.3-syck:: (cd ext/python; python2.3 setup.py build) And please don't forget to add chrpath to build-dependency. --- ../control 2006-04-29 18:59:22.0 +0200 +++ debian/control 2006-04-29 18:59:31.0 +0200 @@ -2,7 +2,7 @@ Priority: optional Section: devel Maintainer: Robert Jordens <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4.1.67), cdbs, dh-buildinfo, flex, python2.3-dev, python-dev, php4-dev (>= 4:4.4.0-1), re2c, bison +Build-Depends: debhelper (>= 4.1.67), cdbs, dh-buildinfo, flex, python2.3-dev, python-dev, php4-dev (>= 4:4.4.0-1), re2c, bison, chrpath Standards-Version: 3.6.1 Package: libsyck0-dev Greetings Steffen pgptqv8l35KZY.pgp Description: PGP signature
Bug#359245: explanation for patch
Re: Steffen Joeris 2006-04-29 <[EMAIL PROTECTED]> > +++ debian/rules2006-04-29 19:01:27.0 +0200 > + chrpath -d $(CURDIR)/debian/php4-syck/usr/lib/php5/20051025/syck.so I'm not sure if that's the proper way to fix that - wouldn't it be better to fix the build system not to generate the rpath in the first place? (Though I couldn't find the place where it is added.) Christoph -- [EMAIL PROTECTED] | http://www.df7cb.de/ signature.asc Description: Digital signature
Bug#359245: explanation for patch
Hi On Monday 15 May 2006 06:22, Christoph Berg wrote: > Re: Steffen Joeris 2006-04-29 > <[EMAIL PROTECTED]> > > > +++ debian/rules2006-04-29 19:01:27.0 +0200 > > + chrpath -d > > $(CURDIR)/debian/php4-syck/usr/lib/php5/20051025/syck.so > > I'm not sure if that's the proper way to fix that - wouldn't it be > better to fix the build system not to generate the rpath in the first > place? (Though I couldn't find the place where it is added.) I would prefer to fix it that way and directly report it to upstream, so that upstream removes this rpath for the next upstream version. Changing the build system would be too much effort when upstream removes it with their next version. So applying this short fix for now is IMHO a better way. Greetings Steffen pgpvbuRatNPnl.pgp Description: PGP signature
Bug#359245: explanation for patch
Re: Steffen Joeris 2006-05-15 <[EMAIL PROTECTED]>
> I would prefer to fix it that way and directly report it to upstream, so that
> upstream removes this rpath for the next upstream version. Changing the build
> system would be too much effort when upstream removes it with their next
> version. So applying this short fix for now is IMHO a better way.
Ok. I'll upload the NMU to delayed/10.
Christoph
debdiff syck_0.55-3.dsc syck_0.55-3.1.dsc
syck-0.55/debian/control |2
syck-0.55/debian/rules |1
syck-0.55/debian/changelog |8
lib/implicit.c | 207 +--
lib/token.c| 478 ++---
5 files changed, 354 insertions(+), 342 deletions(-)
diff -u syck-0.55/debian/control syck-0.55/debian/control
--- syck-0.55/debian/control
+++ syck-0.55/debian/control
@@ -2,7 +2,7 @@
Priority: optional
Section: devel
Maintainer: Robert Jordens <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.67), cdbs, dh-buildinfo, flex, python2.3-dev,
python-dev, php4-dev (>= 4:4.4.0-1), re2c, bison
+Build-Depends: debhelper (>= 4.1.67), cdbs, dh-buildinfo, flex, python2.3-dev,
python-dev, php4-dev (>= 4:4.4.0-1), re2c, bison, chrpath
Standards-Version: 3.6.1
Package: libsyck0-dev
diff -u syck-0.55/debian/rules syck-0.55/debian/rules
--- syck-0.55/debian/rules
+++ syck-0.55/debian/rules
@@ -22,6 +22,7 @@
# after the directories are created but before dh_compress is run.
common-binary-post-install-arch::
dh_buildinfo
+ chrpath -d $(CURDIR)/debian/php4-syck/usr/lib/php5/20051025/syck.so
build/python2.3-syck::
(cd ext/python; python2.3 setup.py build)
diff -u syck-0.55/debian/changelog syck-0.55/debian/changelog
--- syck-0.55/debian/changelog
+++ syck-0.55/debian/changelog
@@ -1,3 +1,11 @@
+syck (0.55-3.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Remove rpath on /usr/lib/php5/20051025/syck.so (Closes: #359245)
+ * Add chrpath to build-dependencies
+
+ -- Steffen Joeris <[EMAIL PROTECTED]> Sat, 29 Apr 2006 19:06:09 +0200
+
syck (0.55-3) unstable; urgency=low
* debian/{control,rules}: use output from php4-config --phpapi instead of
only in patch2:
unchanged:
--- syck-0.55.orig/lib/implicit.c
+++ syck-0.55/lib/implicit.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.3 on Wed Mar 30 08:27:25 2005 */
+/* Generated by re2c 0.9.12 on Sat Apr 29 18:56:51 2006 */
#line 1 "implicit.re"
/*
* implicit.re
@@ -9,6 +9,7 @@
* Copyright (C) 2003 why the lucky stiff
*/
+#include
#include "syck.h"
#define YYCTYPE char
@@ -51,17 +52,17 @@
limit = str + len;
-#line 6 ""
+#line 56 ""
{
YYCTYPE yych;
- unsigned int yyaccept;
+ unsigned int yyaccept = 0;
goto yy0;
-yy1: ++YYCURSOR;
+ ++YYCURSOR;
yy0:
if((YYLIMIT - YYCURSOR) < 26) YYFILL(26);
yych = *YYCURSOR;
switch(yych){
- case '\000':goto yy6;
+ case 0x00: goto yy6;
case '+': goto yy16;
case '-': goto yy17;
case '.': goto yy20;
@@ -91,12 +92,12 @@
default:goto yy23;
}
yy2: ++YYCURSOR;
- if((yych = *YYCURSOR) <= '\000')goto yy6;
+ if((yych = *YYCURSOR) <= 0x00) goto yy6;
goto yy3;
yy3:
-#line 123 "implicit.re"
+#line 124 "implicit.re"
{ return "str"; }
-#line 51 ""
+#line 101 ""
yy4: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
switch(yych){
@@ -115,9 +116,9 @@
yy6: ++YYCURSOR;
goto yy7;
yy7:
-#line 85 "implicit.re"
+#line 86 "implicit.re"
{ return "null"; }
-#line 72 ""
+#line 122 ""
yy8: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
switch(yych){
@@ -207,7 +208,7 @@
yy18: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
switch(yych){
- case '\000':goto yy52;
+ case 0x00: goto yy52;
case ',': goto yy142;
case '.': goto yy50;
case '0':
@@ -227,7 +228,7 @@
yy19: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
switch(yych){
- case '\000':goto yy52;
+ case 0x00: goto yy52;
case ',': goto yy47;
case '.': goto yy50;
case '0':
@@ -253,7 +254,7 @@
default:goto yy3;
}
yy21: yych = *++YYCURSOR;
- if(yych <= '\000') goto yy28;
+ if(yych <= 0x00)goto yy28;
goto yy3;
yy22: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
@@ -264,7 +265,7 @@
yy23: yych = *++YYCURSOR;
goto yy3;
yy24: yych = *++YYCURSOR;
- if(yych <= '\000') goto yy26;
+ if(yych <= 0x00)goto yy26;
goto yy25;
yy25: YYCURSOR = YYMARKER;
switch(yyaccept){
@@ -273,15 +274,15 @@
yy26: ++YYCURSOR;
goto yy27;
yy27:
-#line 121 "implicit.re"
+#line 122 "implicit.re"
{ return "merge"; }
-#line 230 ""
+#line 280 ""
yy28: ++YYCURSOR;
goto yy29;
yy29:
-#line 119
Bug#359245: explanation for patch
Re: Steffen Joeris 2006-04-29 <[EMAIL PROTECTED]> > --- ../rules.orig 2006-04-29 18:58:12.0 +0200 > +++ debian/rules2006-04-29 19:01:27.0 +0200 > @@ -22,6 +22,7 @@ > # after the directories are created but before dh_compress is run. > common-binary-post-install-arch:: > dh_buildinfo > + chrpath -d $(CURDIR)/debian/php4-syck/usr/lib/php5/20051025/syck.so Gnarf, it doesn't build: dh_link -pphp4-syck dh_buildinfo chrpath -d /tmp/buildd/syck-0.55/debian/php4-syck/usr/lib/php5/20051025/syck.so open: No such file or directory elf_open: Invalid argument make: *** [common-binary-post-install-arch] Error 1 Christoph signature.asc Description: Digital signature
Bug#359245: explanation for patch
On Mon, 2006-05-15 at 22:03 +0200, Christoph Berg wrote: > Re: Steffen Joeris 2006-05-15 <[EMAIL PROTECTED]> > > I would prefer to fix it that way and directly report it to upstream, so > > that > > upstream removes this rpath for the next upstream version. Changing the > > build > > system would be too much effort when upstream removes it with their next > > version. So applying this short fix for now is IMHO a better way. > > Ok. I'll upload the NMU to delayed/10. Sorry for not having a look at this for so long. Please go ahead and upload your NMU now if you want. Robert. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Bug#359245: explanation for patch
Hi > Gnarf, it doesn't build: > > dh_link -pphp4-syck > dh_buildinfo > chrpath -d > /tmp/buildd/syck-0.55/debian/php4-syck/usr/lib/php5/20051025/syck.so open: > No such file or directory > elf_open: Invalid argument > make: *** [common-binary-post-install-arch] Error 1 > > Christoph Argh, I love this php stuff. You find the fixed NMU-version under http://www.formorer.de/~white/debian/nmu/syck/ Greetings Steffen pgpvTSDjmjqqI.pgp Description: PGP signature
Bug#359245: explanation for patch
Re: Steffen Joeris 2006-05-16 <[EMAIL PROTECTED]>
> Argh, I love this php stuff. You find the fixed NMU-version under
> http://www.formorer.de/~white/debian/nmu/syck/
Ok, here's the correct patch now. Uploading to unstable, thanks to
Robert.
Christoph
debdiff syck_0.55-3.dsc ./syck_0.55-3.1.dsc
syck-0.55/debian/control |2
syck-0.55/debian/rules |1
syck-0.55/debian/changelog |8
lib/implicit.c | 207 +--
lib/token.c| 478 ++---
5 files changed, 354 insertions(+), 342 deletions(-)
diff -u syck-0.55/debian/control syck-0.55/debian/control
--- syck-0.55/debian/control
+++ syck-0.55/debian/control
@@ -2,7 +2,7 @@
Priority: optional
Section: devel
Maintainer: Robert Jordens <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.67), cdbs, dh-buildinfo, flex, python2.3-dev,
python-dev, php4-dev (>= 4:4.4.0-1), re2c, bison
+Build-Depends: debhelper (>= 4.1.67), cdbs, dh-buildinfo, flex, python2.3-dev,
python-dev, php4-dev (>= 4:4.4.0-1), re2c, bison, chrpath
Standards-Version: 3.6.1
Package: libsyck0-dev
diff -u syck-0.55/debian/rules syck-0.55/debian/rules
--- syck-0.55/debian/rules
+++ syck-0.55/debian/rules
@@ -48,6 +48,7 @@
binary-predeb/php4-syck::
echo "php:Depends=phpapi-$(phpapiver)" >> debian/php4-syck.substvars
+ chrpath -d $(CURDIR)/debian/php4-syck$(shell php-config
--extension-dir)/syck.so
clean::
-(cd ext/python; python2.3 setup.py clean -a)
diff -u syck-0.55/debian/changelog syck-0.55/debian/changelog
--- syck-0.55/debian/changelog
+++ syck-0.55/debian/changelog
@@ -1,3 +1,11 @@
+syck (0.55-3.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Remove rpath on /usr/lib/php5/20051025/syck.so (Closes: #359245)
+ * Add chrpath to build-dependencies
+
+ -- Steffen Joeris <[EMAIL PROTECTED]> Sat, 29 Apr 2006 19:06:09 +0200
+
syck (0.55-3) unstable; urgency=low
* debian/{control,rules}: use output from php4-config --phpapi instead of
only in patch2:
unchanged:
--- syck-0.55.orig/lib/implicit.c
+++ syck-0.55/lib/implicit.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.3 on Wed Mar 30 08:27:25 2005 */
+/* Generated by re2c 0.9.12 on Sat Apr 29 18:56:51 2006 */
#line 1 "implicit.re"
/*
* implicit.re
@@ -9,6 +9,7 @@
* Copyright (C) 2003 why the lucky stiff
*/
+#include
#include "syck.h"
#define YYCTYPE char
@@ -51,17 +52,17 @@
limit = str + len;
-#line 6 ""
+#line 56 ""
{
YYCTYPE yych;
- unsigned int yyaccept;
+ unsigned int yyaccept = 0;
goto yy0;
-yy1: ++YYCURSOR;
+ ++YYCURSOR;
yy0:
if((YYLIMIT - YYCURSOR) < 26) YYFILL(26);
yych = *YYCURSOR;
switch(yych){
- case '\000':goto yy6;
+ case 0x00: goto yy6;
case '+': goto yy16;
case '-': goto yy17;
case '.': goto yy20;
@@ -91,12 +92,12 @@
default:goto yy23;
}
yy2: ++YYCURSOR;
- if((yych = *YYCURSOR) <= '\000')goto yy6;
+ if((yych = *YYCURSOR) <= 0x00) goto yy6;
goto yy3;
yy3:
-#line 123 "implicit.re"
+#line 124 "implicit.re"
{ return "str"; }
-#line 51 ""
+#line 101 ""
yy4: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
switch(yych){
@@ -115,9 +116,9 @@
yy6: ++YYCURSOR;
goto yy7;
yy7:
-#line 85 "implicit.re"
+#line 86 "implicit.re"
{ return "null"; }
-#line 72 ""
+#line 122 ""
yy8: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
switch(yych){
@@ -207,7 +208,7 @@
yy18: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
switch(yych){
- case '\000':goto yy52;
+ case 0x00: goto yy52;
case ',': goto yy142;
case '.': goto yy50;
case '0':
@@ -227,7 +228,7 @@
yy19: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
switch(yych){
- case '\000':goto yy52;
+ case 0x00: goto yy52;
case ',': goto yy47;
case '.': goto yy50;
case '0':
@@ -253,7 +254,7 @@
default:goto yy3;
}
yy21: yych = *++YYCURSOR;
- if(yych <= '\000') goto yy28;
+ if(yych <= 0x00)goto yy28;
goto yy3;
yy22: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
@@ -264,7 +265,7 @@
yy23: yych = *++YYCURSOR;
goto yy3;
yy24: yych = *++YYCURSOR;
- if(yych <= '\000') goto yy26;
+ if(yych <= 0x00)goto yy26;
goto yy25;
yy25: YYCURSOR = YYMARKER;
switch(yyaccept){
@@ -273,15 +274,15 @@
yy26: ++YYCURSOR;
goto yy27;
yy27:
-#line 121 "implicit.re"
+#line 122 "implicit.re"
{ return "merge"; }
-#line 230 ""
+#line 280 ""
yy28: ++YYCURSOR;
goto yy29;
yy29:
-#line 119 "implicit.re"
+#line 120 "implicit.re"
{ return "default"; }
-#line 236 ""
+#line 286 ""
yy30: yych = *++YYCURSOR;
switch(yych){
case 'a':
