From b387eb65fad720b85878147e616aca6e545626ae Mon Sep 17 00:00:00 2001 From: Juergen Daubert Date: Wed, 2 Mar 2011 12:39:09 +0100 Subject: [PATCH] readline: update to 6.2.1 --- readline/.footprint | 13 +++++++------ readline/.md5sum | 4 ++-- readline/Pkgfile | 25 ++++++++++++++----------- readline/readline-6.1-001-002.patch.gz | Bin 1080 -> 0 bytes readline/readline-6.2.1.patch.gz | Bin 0 -> 766 bytes 5 files changed, 23 insertions(+), 19 deletions(-) delete mode 100644 readline/readline-6.1-001-002.patch.gz create mode 100644 readline/readline-6.2.1.patch.gz diff --git a/readline/.footprint b/readline/.footprint index 5597b42b..2b07fbd2 100644 --- a/readline/.footprint +++ b/readline/.footprint @@ -1,11 +1,12 @@ drwxr-xr-x root/root etc/ -rw-r--r-- root/root etc/inputrc drwxr-xr-x root/root lib/ -lrwxrwxrwx root/root lib/libhistory.so.6 -> libhistory.so.6.1 --r-xr-xr-x root/root lib/libhistory.so.6.1 -lrwxrwxrwx root/root lib/libreadline.so.6 -> libreadline.so.6.1 --r-xr-xr-x root/root lib/libreadline.so.6.1 +lrwxrwxrwx root/root lib/libhistory.so.6 -> libhistory.so.6.2 +-r-xr-xr-x root/root lib/libhistory.so.6.2 +lrwxrwxrwx root/root lib/libreadline.so.6 -> libreadline.so.6.2 +-r-xr-xr-x root/root lib/libreadline.so.6.2 drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/readline/ -rw-r--r-- root/root usr/include/readline/chardefs.h @@ -18,9 +19,9 @@ drwxr-xr-x root/root usr/include/readline/ -rw-r--r-- root/root usr/include/readline/tilde.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libhistory.a -lrwxrwxrwx root/root usr/lib/libhistory.so -> ../../lib/libhistory.so.6.1 +lrwxrwxrwx root/root usr/lib/libhistory.so -> ../../lib/libhistory.so.6.2 -rw-r--r-- root/root usr/lib/libreadline.a -lrwxrwxrwx root/root usr/lib/libreadline.so -> ../../lib/libreadline.so.6.1 +lrwxrwxrwx root/root usr/lib/libreadline.so -> ../../lib/libreadline.so.6.2 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/history.3.gz diff --git a/readline/.md5sum b/readline/.md5sum index c4d5ab54..cdf3b851 100644 --- a/readline/.md5sum +++ b/readline/.md5sum @@ -1,3 +1,3 @@ 553cf04fdeec54dca12062864c3ffba3 inputrc -d2bab3b49b2cc4d9239cf04e809abb18 readline-6.1-001-002.patch.gz -fc2f7e714fe792db1ce6ddc4c9fb4ef3 readline-6.1.tar.gz +20ad06e656f2d36846987f116d620147 readline-6.2.1.patch.gz +67948acb2ca081f23359d0256e9a271c readline-6.2.tar.gz diff --git a/readline/Pkgfile b/readline/Pkgfile index 1f32cae3..385f5fef 100644 --- a/readline/Pkgfile +++ b/readline/Pkgfile @@ -4,24 +4,27 @@ # Depends on: ncurses name=readline -version=6.1.2 -release=2 -source=(http://ftp.gnu.org/gnu/$name/$name-6.1.tar.gz \ - $name-6.1-001-002.patch.gz inputrc) +version=6.2.1 +release=1 +source=(http://ftp.gnu.org/gnu/$name/$name-${version::3}.tar.gz \ + $name-$version.patch.gz inputrc) build() { - cd $name-6.1 - - gunzip -c $SRC/$name-6.1-001-002.patch.gz | patch -p0 - + cd $name-${version::3} + + gunzip -c $SRC/$name-$version.patch.gz | patch -p0 + + # Don't use rpath for linking the shared libs + sed -i '117s/-Wl,-rpath,$(libdir)//' support/shobj-conf + ./configure --prefix=/usr --mandir=/usr/man make SHLIB_LIBS=-lncurses make DESTDIR=$PKG install - + install -d $PKG/lib mv $PKG/usr/lib/lib*.so.* $PKG/lib - ln -sf ../../lib/libhistory.so.6.1 $PKG/usr/lib/libhistory.so - ln -sf ../../lib/libreadline.so.6.1 $PKG/usr/lib/libreadline.so + ln -sf ../../lib/libhistory.so.${version::3} $PKG/usr/lib/libhistory.so + ln -sf ../../lib/libreadline.so.${version::3} $PKG/usr/lib/libreadline.so install -D -m 644 $SRC/inputrc $PKG/etc/inputrc rm -r $PKG/usr/share/info diff --git a/readline/readline-6.1-001-002.patch.gz b/readline/readline-6.1-001-002.patch.gz deleted file mode 100644 index 309a41c076a2449a8dc8c749896d934e5be905c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1080 zcmV-81jqXyiwFo@UXe=x19D|yWNc|}Wi2)?F)c7KF)c7KGA?jobYo}$-Bn$0+cp$^ zmVU(@3UrBQNu>OdMC*!Vb%MA^lfX@fy?L}mS;Qn!AgLtA(Eq+m%69A28-lgl!vw*y z$a@d(IXt}bJP!b7=Vz0v>Ge6>p548<#Mj%K*`4pXxu5o3zCYtED@DzN88120Jb`gY z{aa?zBA8ARQ0w_I4G5vW|8u*<&_*i5vtY4Gyk#rOlC>2NWoryq`ZQOZhq+pZ=3MbQ zrb(ix6x!%; zS+}87%ZRD85cfPPOjSk;Oj#-Lwkx)wmJi}9t@chyCLOgwVZm@|!tMNdux>Y+7x-u-r zTA_b{fof*Y8j30Ck5cfo|p{y$9-E96=G^h1G|dp;feI=^k9o7Dju zskXgL)F?saIyyWs?SyKZjJYn0;ux3Yn1IZ;X~^ko+t_9>EV?#^{))#C4-$e-8SOY_ zxHi{LN@p%iL30gbyq{&RA?Xjt8++j$_27~}1}L1&kn-%QK6P6yxC)^cp)X!!Jhzjx ztNF$m^Iy(q@25A{9(g2VLOc%vw;>)n%3GXssRp&1uo6wCLB+qR*rCe``$i8#E^D7k>hD-Y7l!3IG6Y5)OX= diff --git a/readline/readline-6.2.1.patch.gz b/readline/readline-6.2.1.patch.gz new file mode 100644 index 0000000000000000000000000000000000000000..a299447827a2f45f194a9b1b90136afa016dfd8b GIT binary patch literal 766 zcmVIB^@+>UO>fv%OlvtOC6k2ztnNVzfQF(*0qp>4YQh$tEv{R%sd zr!yQp1|qqf-XD@~tLKSy_F>e1TzdB-Dq8C7>mA)6IFt3&XL<3qO!eD@x8s4YMM^Dv z%Zf#=a&w+8%}mZMB55R6+=^5ZTT=|0l033p+i?urwUT^}C3%Nt;jSvX;5n6Ip+uJY zx*kOQxqes)Bgq(t2TJ#v@W2>8Ny^}1z1{<4mEb0a8FJ(dR0aqZvo)xQ>pWFLawyW6 zy8bbUL=KCh!yr;sIJ1<*@fujhb4W9_jV&=TU-9^pUP%HqvREMUi%=0fR5^@=y;n!J zjYb1Z)7la?P)DOgaAvJUSdcfVhQ-?k*6-Tj9Q&T*9~_(Z*1)hm+tv-kfSrhfYXZTJ(uUyB(qKEoC;4Bt#d*zF7k=bi5RNxdxZ zJ2~7L|C8KGuq??|JY*uT1gjdQSxs|eIKg$o^wwrk2SPhs&*)nDj;bg=d@EpsvibOhZ;<=~slHn34 z-a6@W(S&rFa49GdImcD1@@AC>tr)YSnFT(Z&EQ4bp<(I!1sFS7h|-_@EYR@wx;O53 wJLAhb-h^P+D}1GRF@+LGFr*QY;f4{^P^5jRNK|4LqG?b1H-0{2b8H0w0JCv+DF6Tf literal 0 HcmV?d00001