wok-next rev 20512
Tiny edits, patch ptlib
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Mar 17 04:50:25 2018 +0200 (2018-03-17) |
| parents | 41f7b84e8b0c |
| children | d43bf7aae921 |
| files | lame/receipt opal/receipt opus/receipt ptlib/receipt ptlib/stuff/patches/ptlib-2.10.11-openssl-1.1.0-1.patch ptlib/stuff/patches/series |
line diff
1.1 --- a/lame/receipt Fri Mar 16 17:17:21 2018 +0200 1.2 +++ b/lame/receipt Sat Mar 17 04:50:25 2018 +0200 1.3 @@ -1,12 +1,13 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="lame" 1.7 -VERSION="3.99.5" 1.8 +VERSION="3.100" 1.9 CATEGORY="multimedia" 1.10 SHORT_DESC="MPEG Audio Layer III (MP3) encoder" 1.11 MAINTAINER="pankso@slitaz.org" 1.12 LICENSE="LGPL2" 1.13 WEB_SITE="http://lame.sourceforge.net/" 1.14 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/lame.html" 1.15 1.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.17 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 1.18 @@ -15,10 +16,7 @@ 1.19 BUILD_DEPENDS="ncurses-dev nasm" 1.20 SPLIT="lame-dev" 1.21 1.22 -# Rules to configure and make the package. 1.23 -compile_rules() 1.24 -{ 1.25 - # http://www.linuxfromscratch.org/blfs/view/stable/multimedia/lame.html 1.26 +compile_rules() { 1.27 case $(uname -m) in 1.28 i?86) sed -i -e '/xmmintrin\.h/d' configure ;; 1.29 esac 1.30 @@ -32,9 +30,7 @@ 1.31 make pkghtmldir=/usr/share/doc/lame-$VERSION install 1.32 } 1.33 1.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.35 -genpkg_rules() 1.36 -{ 1.37 +genpkg_rules() { 1.38 case $PACKAGE in 1.39 lame) 1.40 copy @std
2.1 --- a/opal/receipt Fri Mar 16 17:17:21 2018 +0200 2.2 +++ b/opal/receipt Sat Mar 17 04:50:25 2018 +0200 2.3 @@ -3,46 +3,51 @@ 2.4 PACKAGE="opal" 2.5 VERSION="3.10.10" 2.6 CATEGORY="network" 2.7 -SHORT_DESC="Open Phone Abstraction library." 2.8 +SHORT_DESC="Open Phone Abstraction library" 2.9 MAINTAINER="pascal.bellard@slitaz.org" 2.10 LICENSE="MPL" 2.11 +WEB_SITE="http://www.ekiga.org/" 2.12 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/opal.html" 2.13 + 2.14 TARBALL="$PACKAGE-$VERSION.tar.xz" 2.15 -WEB_SITE="http://www.ekiga.org/" 2.16 -WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL" 2.17 -TAGS="telephony" 2.18 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 2.19 2.20 -BUILD_DEPENDS="ptlib ptlib-dev openssl-dev" 2.21 -SPLIT="opal opal-dev" 2.22 +BUILD_DEPENDS="ptlib-dev openssl-dev" 2.23 +SPLIT="opal-dev" 2.24 2.25 -# Rules to configure and make the package. 2.26 -compile_rules() 2.27 -{ 2.28 - sed -i 's/CODEC_ID/AV_&/;s/PIX_FMT_/AV_&/' plugins/video/*/*.cxx 2.29 - sed -i '/<< mime.PrintContents/ s/mime/(const std::string\&)&/' \ 2.30 +compile_rules() { 2.31 + sed -i 's| abs(| std::fabs(|g' plugins/video/common/mpi.cxx 2.32 + 2.33 + sed -i -e 's/CODEC_ID/AV_&/' -e 's/PIX_FMT_/AV_&/' \ 2.34 + plugins/video/H.263-1998/h263-1998.cxx \ 2.35 + plugins/video/common/dyna.cxx \ 2.36 + plugins/video/H.264/h264-x264.cxx \ 2.37 + plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2.38 + 2.39 + sed -i -e '/<< mime.PrintContents/ s/mime/(const std::string\&)&/' \ 2.40 src/im/msrp.cxx 2.41 - ./configure --prefix=/usr --bindir=/bin \ 2.42 - --libexecdir=/usr/bin --mandir=/usr/share/man \ 2.43 - $CONFIGURE_ARGS && 2.44 - CXXFLAGS=-Wno-deprecated-declarations make $MAKEFLAGS && 2.45 - make DESTDIR=$DESTDIR install 2.46 + 2.47 + sed -i -e '/abs(/s/MPI.*)/(int)(&)/' ./plugins/video/common/mpi.cxx 2.48 + 2.49 + ./configure \ 2.50 + $CONFIGURE_ARGS && 2.51 + CXXFLAGS=-Wno-deprecated-declarations \ 2.52 + make $MAKEFLAGS && 2.53 + make DESTDIR=$DESTDIR install || return 1 2.54 + 2.55 + chmod 644 $install/usr/lib/libopal_s.a 2.56 } 2.57 2.58 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.59 -genpkg_rules() 2.60 -{ 2.61 +genpkg_rules() { 2.62 case $PACKAGE in 2.63 - opal) 2.64 - DEPENDS="cyrus-sasl expat jpeg libsdl libogg libtheora \ 2.65 + opal) 2.66 + copy @std 2.67 + DEPENDS="cyrus-sasl expat jpeg libsdl libogg libtheora \ 2.68 libunixODBC openssl ptlib tiff zlib" 2.69 - mkdir -p $fs/usr 2.70 - cp -a $install/usr/lib $fs/usr 2.71 - rm -f $fs/usr/lib/*.a 2.72 - ;; 2.73 - opal-dev) 2.74 - CAT="development|Open Phone Abstraction library devel files." 2.75 - mkdir -p $fs/usr/lib 2.76 - cp -a $install/usr/include $fs/usr 2.77 - cp $install/usr/lib/*.a $fs/usr/lib 2.78 - ;; 2.79 + TAGS="telephony" 2.80 + ;; 2.81 + *-dev) 2.82 + copy @dev 2.83 + ;; 2.84 esac 2.85 }
3.1 --- a/opus/receipt Fri Mar 16 17:17:21 2018 +0200 3.2 +++ b/opus/receipt Sat Mar 17 04:50:25 2018 +0200 3.3 @@ -7,25 +7,21 @@ 3.4 MAINTAINER="pascal.bellard@slitaz.org" 3.5 LICENSE="BSD" 3.6 WEB_SITE="http://opus-codec.org/" 3.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/opus.html" 3.8 3.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 3.10 -#WGET_URL="http://downloads.xiph.org/releases/opus/$TARBALL" 3.11 -WGET_URL="https://archive.mozilla.org/pub/opus/$TARBALL" # from official page, newer 3.12 +WGET_URL="https://archive.mozilla.org/pub/opus/$TARBALL" 3.13 3.14 SPLIT="opus-dev" 3.15 3.16 -# Rules to configure and make the package. 3.17 -compile_rules() 3.18 -{ 3.19 +compile_rules() { 3.20 ./configure \ 3.21 - --docdir=/usr/share/doc/opus-$VERSION \ 3.22 - $CONFIGURE_ARGS && \ 3.23 + --disable-static \ 3.24 + $CONFIGURE_ARGS && 3.25 make && make install 3.26 } 3.27 3.28 -# Rules to gen a SliTaz package suitable for Tazpkg. 3.29 -genpkg_rules() 3.30 -{ 3.31 +genpkg_rules() { 3.32 case $PACKAGE in 3.33 opus) copy @std;; 3.34 *-dev) copy @dev;;
4.1 --- a/ptlib/receipt Fri Mar 16 17:17:21 2018 +0200 4.2 +++ b/ptlib/receipt Sat Mar 17 04:50:25 2018 +0200 4.3 @@ -3,43 +3,41 @@ 4.4 PACKAGE="ptlib" 4.5 VERSION="2.10.11" 4.6 CATEGORY="network" 4.7 -SHORT_DESC="Portable Tools Library for unix and windows." 4.8 +SHORT_DESC="Portable Tools Library for unix and windows" 4.9 MAINTAINER="pascal.bellard@slitaz.org" 4.10 LICENSE="MPL" 4.11 +WEB_SITE="http://www.ekiga.org/" 4.12 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/ptlib.html" 4.13 + 4.14 TARBALL="$PACKAGE-$VERSION.tar.xz" 4.15 -WEB_SITE="http://www.ekiga.org/" 4.16 -WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL" 4.17 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 4.18 4.19 -BUILD_DEPENDS="pkg-config flex openssl-dev cyrus-sasl-dev zlib-dev \ 4.20 -alsa-lib-dev expat-dev" 4.21 -SPLIT="ptlib ptlib-dev" 4.22 +BUILD_DEPENDS="flex openssl-dev cyrus-sasl-dev zlib-dev alsa-lib-dev expat-dev" 4.23 +SPLIT="ptlib-dev" 4.24 4.25 -# Rules to configure and make the package. 4.26 -compile_rules() 4.27 -{ 4.28 - ./configure --prefix=/usr --bindir=/bin \ 4.29 - --libexecdir=/usr/bin --mandir=/usr/share/man \ 4.30 - $CONFIGURE_ARGS && 4.31 +compile_rules() { 4.32 + sed -i "s/sbin\.Right(1) == '\\\\0')/strlen(sbin\.Right(1)) == 0)/" \ 4.33 + src/ptclib/podbc.cxx 4.34 + sed -i '/\/ioctl.h/a#include <sys/uio.h>' src/ptlib/unix/channel.cxx 4.35 + 4.36 + ./configure \ 4.37 + --disable-odbc \ 4.38 + $CONFIGURE_ARGS && 4.39 make && 4.40 - make DESTDIR=$DESTDIR install 4.41 + make DESTDIR=$DESTDIR install || return 1 4.42 + 4.43 + chmod 755 $install/usr/lib/libpt.so.$VERSION 4.44 } 4.45 4.46 -# Rules to gen a SliTaz package suitable for Tazpkg. 4.47 -genpkg_rules() 4.48 -{ 4.49 +genpkg_rules() { 4.50 case $PACKAGE in 4.51 - ptlib) 4.52 - DEPENDS="alsa-lib cyrus-sasl expat libsdl libdv libraw1394 \ 4.53 + ptlib) 4.54 + copy @std 4.55 + DEPENDS="alsa-lib cyrus-sasl expat libsdl libdv libraw1394 \ 4.56 libunixODBC openssl" 4.57 - mkdir -p $fs/usr 4.58 - cp -a $install/usr/lib $fs/usr 4.59 - cp -a $install/usr/bin $fs/usr 4.60 - cp -a $install/usr/share $fs/usr 4.61 - ;; 4.62 - ptlib-dev) 4.63 - CAT="network|Portable Tools Library for unix and windows, development files." 4.64 - mkdir -p $fs/usr 4.65 - cp -a $install/usr/include $fs/usr 4.66 - ;; 4.67 + ;; 4.68 + *-dev) 4.69 + copy @dev 4.70 + ;; 4.71 esac 4.72 }
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/ptlib/stuff/patches/ptlib-2.10.11-openssl-1.1.0-1.patch Sat Mar 17 04:50:25 2018 +0200 5.3 @@ -0,0 +1,152 @@ 5.4 +Submitted by: DJ Lucas (dj_AT_linuxfromscratch_DOT_org) 5.5 +Date: 2017-05-27 5.6 +Initial Package Version: 2.10.11 5.7 +Upstream Status: Submitted 5.8 +Origin: https://git.archlinux.org/svntogit/packages.git/plain/trunk/openssl-1.1.0.patch?h=packages/ptlib 5.9 +Description: Fixes build with OpenSSL-1.1.0. 5.10 + 5.11 + 5.12 +diff -Naurp ptlib-2.10.11-orig/src/ptclib/pssl.cxx ptlib-2.10.11/src/ptclib/pssl.cxx 5.13 +--- ptlib-2.10.11-orig/src/ptclib/pssl.cxx 2017-05-27 14:10:00.609612786 -0500 5.14 ++++ ptlib-2.10.11/src/ptclib/pssl.cxx 2017-05-27 14:11:20.232842073 -0500 5.15 +@@ -140,7 +140,7 @@ PFACTORY_CREATE_SINGLETON(PProcessStartu 5.16 + class PSSL_BIO 5.17 + { 5.18 + public: 5.19 +- PSSL_BIO(BIO_METHOD *method = BIO_s_file_internal()) 5.20 ++ PSSL_BIO(const BIO_METHOD *method = BIO_s_file()) 5.21 + { bio = BIO_new(method); } 5.22 + 5.23 + ~PSSL_BIO() 5.24 +@@ -627,9 +627,10 @@ PSSLDiffieHellman::PSSLDiffieHellman(con 5.25 + if (dh == NULL) 5.26 + return; 5.27 + 5.28 +- dh->p = BN_bin2bn(pData, pSize, NULL); 5.29 +- dh->g = BN_bin2bn(gData, gSize, NULL); 5.30 +- if (dh->p != NULL && dh->g != NULL) 5.31 ++ BIGNUM *p = BN_bin2bn(pData, pSize, NULL); 5.32 ++ BIGNUM *g = BN_bin2bn(gData, gSize, NULL); 5.33 ++ DH_set0_pqg(dh, p, NULL, g); 5.34 ++ if (p != NULL && p != NULL) 5.35 + return; 5.36 + 5.37 + DH_free(dh); 5.38 +@@ -805,13 +806,11 @@ void PSSLContext::Construct(Method metho 5.39 + SSL_METHOD * meth; 5.40 + 5.41 + switch (method) { 5.42 +- case SSLv3: 5.43 +- meth = SSLv3_method(); 5.44 +- break; 5.45 + case TLSv1: 5.46 + meth = TLSv1_method(); 5.47 + break; 5.48 + case SSLv23: 5.49 ++ case SSLv3: 5.50 + default: 5.51 + meth = SSLv23_method(); 5.52 + break; 5.53 +@@ -1117,7 +1116,7 @@ PBoolean PSSLChannel::RawSSLRead(void * 5.54 + // 5.55 + 5.56 + 5.57 +-#define PSSLCHANNEL(bio) ((PSSLChannel *)(bio->ptr)) 5.58 ++#define PSSLCHANNEL(bio) ((PSSLChannel *)BIO_get_data(bio)) 5.59 + 5.60 + extern "C" { 5.61 + 5.62 +@@ -1130,10 +1129,9 @@ typedef long (*lfptr)(); 5.63 + 5.64 + static int Psock_new(BIO * bio) 5.65 + { 5.66 +- bio->init = 0; 5.67 +- bio->num = 0; 5.68 +- bio->ptr = NULL; // this is really (PSSLChannel *) 5.69 +- bio->flags = 0; 5.70 ++ BIO_set_init(bio, 0); 5.71 ++ BIO_set_data(bio, NULL); 5.72 ++ BIO_clear_flags(bio, ~0); 5.73 + 5.74 + return(1); 5.75 + } 5.76 +@@ -1144,13 +1142,13 @@ static int Psock_free(BIO * bio) 5.77 + if (bio == NULL) 5.78 + return 0; 5.79 + 5.80 +- if (bio->shutdown) { 5.81 +- if (bio->init) { 5.82 ++ if (BIO_get_shutdown(bio)) { 5.83 ++ if (BIO_get_init(bio)) { 5.84 + PSSLCHANNEL(bio)->Shutdown(PSocket::ShutdownReadAndWrite); 5.85 + PSSLCHANNEL(bio)->Close(); 5.86 + } 5.87 +- bio->init = 0; 5.88 +- bio->flags = 0; 5.89 ++ BIO_set_init(bio, 0); 5.90 ++ BIO_clear_flags(bio, ~0); 5.91 + } 5.92 + return 1; 5.93 + } 5.94 +@@ -1160,11 +1158,11 @@ static long Psock_ctrl(BIO * bio, int cm 5.95 + { 5.96 + switch (cmd) { 5.97 + case BIO_CTRL_SET_CLOSE: 5.98 +- bio->shutdown = (int)num; 5.99 ++ BIO_set_shutdown(bio, (int)num); 5.100 + return 1; 5.101 + 5.102 + case BIO_CTRL_GET_CLOSE: 5.103 +- return bio->shutdown; 5.104 ++ return BIO_get_shutdown(bio); 5.105 + 5.106 + case BIO_CTRL_FLUSH: 5.107 + return 1; 5.108 +@@ -1239,7 +1237,8 @@ static int Psock_puts(BIO * bio, const c 5.109 + }; 5.110 + 5.111 + 5.112 +-static BIO_METHOD methods_Psock = 5.113 ++static BIO_METHOD *methods_Psock = NULL; 5.114 ++/* 5.115 + { 5.116 + BIO_TYPE_SOCKET, 5.117 + "PTLib-PSSLChannel", 5.118 +@@ -1261,19 +1260,33 @@ static BIO_METHOD methods_Psock = 5.119 + Psock_free 5.120 + #endif 5.121 + }; 5.122 +- 5.123 ++*/ 5.124 + 5.125 + PBoolean PSSLChannel::OnOpen() 5.126 + { 5.127 +- BIO * bio = BIO_new(&methods_Psock); 5.128 ++ if (methods_Psock == NULL) { 5.129 ++ methods_Psock = BIO_meth_new(BIO_TYPE_SOCKET | BIO_get_new_index(), "PTLib-PSSLChannel"); 5.130 ++ if (methods_Psock == NULL || 5.131 ++ BIO_meth_set_write(methods_Psock, Psock_write) || 5.132 ++ BIO_meth_set_read(methods_Psock, Psock_read) || 5.133 ++ BIO_meth_set_puts(methods_Psock, Psock_puts) || 5.134 ++ BIO_meth_set_gets(methods_Psock, NULL) || 5.135 ++ BIO_meth_set_ctrl(methods_Psock, Psock_ctrl) || 5.136 ++ BIO_meth_set_create(methods_Psock, Psock_new) || 5.137 ++ BIO_meth_set_destroy(methods_Psock, Psock_free)) { 5.138 ++ SSLerr(SSL_F_SSL_SET_FD,ERR_R_BUF_LIB); 5.139 ++ return PFalse; 5.140 ++ } 5.141 ++ } 5.142 ++ BIO * bio = BIO_new(methods_Psock); 5.143 + if (bio == NULL) { 5.144 + SSLerr(SSL_F_SSL_SET_FD,ERR_R_BUF_LIB); 5.145 + return PFalse; 5.146 + } 5.147 + 5.148 + // "Open" then bio 5.149 +- bio->ptr = this; 5.150 +- bio->init = 1; 5.151 ++ BIO_set_data(bio, this); 5.152 ++ BIO_set_init(bio, 1); 5.153 + 5.154 + SSL_set_bio(ssl, bio, bio); 5.155 + return PTrue;