Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=de86477a39a208eca6bf675d8ef46c8434a9c7d9
commit de86477a39a208eca6bf675d8ef46c8434a9c7d9 Author: Michel Hermier <[email protected]> Date: Fri Jan 3 10:52:00 2014 +0100 Revert "heimdal-1.3.3-3-x86_64" This reverts commit 8e4d1297bbcef51438a0641227aec96f28a6234c. diff --git a/source/lib-extra/heimdal/FrugalBuild b/source/lib-extra/heimdal/FrugalBuild new file mode 100644 index 0000000..cd73446 --- /dev/null +++ b/source/lib-extra/heimdal/FrugalBuild @@ -0,0 +1,44 @@ +# Compiling Time: ~0.8 SBU +# Contributor: Laszlo Dvornik <[email protected]> +# Maintainer: voroskoi <[email protected]> + +pkgname=heimdal +pkgver=1.3.3 +pkgrel=3 +pkgdesc="Heimdal Kerberos V5 libraries" +url="http://www.h5l.org" +groups=('lib-extra') +archs=('i686' 'x86_64' 'arm') +depends=('e2fsprogs' 'openssl>=1.0.0' 'ncurses' 'db>=4.7.25') +up2date="Flasttar $url/dist/src" +source=(http://www.h5l.org/dist/src/${pkgname}-${pkgver}.tar.gz drop_md2_support.diff) +[ "$CARCH" == "x86_64" ] && Fconfopts+=" --with-pic" +signatures=("$source.asc" '') +Finclude texinfo + +build() +{ + Fbuild --enable-shared=yes --enable-static=no \ + --without-x --enable-pthread-support \ + --libexecdir=/usr/sbin --with-gnu-ld + for i in ftp login rcp rsh su telnet; do + Fmv usr/bin/$i usr/bin/k$i + [ -e $Fdestdir/usr/share/man/man1/$i.1 ] && Fmv usr/share/man/man1/$i.1 usr/share/man/man1/k$i.1 + done + for i in ftpd rshd telnetd; do + Fmv usr/sbin/$i usr/sbin/k$i + Fmv usr/share/man/man8/$i.8 usr/share/man/man8/k$i.8 + done + Frm usr/share/man/cat* + # conflicts with man-pages + Frm usr/share/man/man5/ftpusers.5* + # conflicts with shadow + Frm usr/share/man/man5/login.access.5* + # conflicts with e2fsprogs http://wiki.linuxfromscratch.org/blfs/ticket/1526 + Frm usr/include/ss/ss.h + Frm usr/lib/libss.* + # conflicts with libedit + Fmv /usr/share/man/man3/{,k}editline.3 +} + +# optimization OK diff --git a/source/lib-extra/heimdal/drop_md2_support.diff b/source/lib-extra/heimdal/drop_md2_support.diff new file mode 100644 index 0000000..0073414 --- /dev/null +++ b/source/lib-extra/heimdal/drop_md2_support.diff @@ -0,0 +1,178 @@ +From 2a842e90d3417b667de0c5ecea7afa97496bdb4b Mon Sep 17 00:00:00 2001 +From: Love Hornquist Astrand <[email protected]> +Date: Wed, 28 Apr 2010 22:10:27 +0200 +Subject: [PATCH] Drop MD2 support + +Patch partly from Guillaume Rousse +--- + include/crypto-headers.h | 2 - + lib/hx509/crypto.c | 46 --------------------------------------- + lib/hx509/ks_p11.c | 1 - + lib/hx509/libhx509-exports.def | 2 - + lib/hx509/tst-crypto-available2 | 1 - + lib/hx509/version-script.map | 2 - + 6 files changed, 0 insertions(+), 54 deletions(-) + +diff --git a/include/crypto-headers.h b/include/crypto-headers.h +index 60737aa..a23aaf8 100644 +--- a/include/crypto-headers.h ++++ b/include/crypto-headers.h +@@ -13,7 +13,6 @@ + #include <openssl/des.h> + #include <openssl/rc4.h> + #include <openssl/rc2.h> +-#include <openssl/md2.h> + #include <openssl/md4.h> + #include <openssl/md5.h> + #include <openssl/sha.h> +@@ -39,7 +38,6 @@ + + #include <hcrypto/evp.h> + #include <hcrypto/des.h> +-#include <hcrypto/md2.h> + #include <hcrypto/md4.h> + #include <hcrypto/md5.h> + #include <hcrypto/sha.h> +diff --git a/lib/hx509/crypto.c b/lib/hx509/crypto.c +index 77be441..26ae316 100644 +--- a/lib/hx509/crypto.c ++++ b/lib/hx509/crypto.c +@@ -149,11 +149,6 @@ const AlgorithmIdentifier _hx509_signature_md5_data = { + { 6, rk_UNCONST(md5_oid_tree) }, rk_UNCONST(&null_entry_oid) + }; + +-static const unsigned md2_oid_tree[] = { 1, 2, 840, 113549, 2, 2 }; +-const AlgorithmIdentifier _hx509_signature_md2_data = { +- { 6, rk_UNCONST(md2_oid_tree) }, rk_UNCONST(&null_entry_oid) +-}; +- + static const unsigned ecPublicKey[] ={ 1, 2, 840, 10045, 2, 1 }; + const AlgorithmIdentifier _hx509_signature_ecPublicKey = { + { 6, rk_UNCONST(ecPublicKey) }, NULL +@@ -194,11 +189,6 @@ const AlgorithmIdentifier _hx509_signature_rsa_with_md5_data = { + { 7, rk_UNCONST(rsa_with_md5_oid) }, NULL + }; + +-static const unsigned rsa_with_md2_oid[] ={ 1, 2, 840, 113549, 1, 1, 2 }; +-const AlgorithmIdentifier _hx509_signature_rsa_with_md2_data = { +- { 7, rk_UNCONST(rsa_with_md2_oid) }, NULL +-}; +- + static const unsigned rsa_oid[] ={ 1, 2, 840, 113549, 1, 1, 1 }; + const AlgorithmIdentifier _hx509_signature_rsa_data = { + { 7, rk_UNCONST(rsa_oid) }, NULL +@@ -1290,19 +1280,6 @@ static const struct signature_alg rsa_with_md5_alg = { + rsa_create_signature + }; + +-static const struct signature_alg rsa_with_md2_alg = { +- "rsa-with-md2", +- &asn1_oid_id_pkcs1_md2WithRSAEncryption, +- &_hx509_signature_rsa_with_md2_data, +- &asn1_oid_id_pkcs1_rsaEncryption, +- &_hx509_signature_md2_data, +- PROVIDE_CONF|REQUIRE_SIGNER|RA_RSA_USES_DIGEST_INFO|SIG_PUBLIC_SIG, +- 1230739889, +- NULL, +- rsa_verify_signature, +- rsa_create_signature +-}; +- + static const struct signature_alg dsa_sha1_alg = { + "dsa-with-sha1", + &asn1_oid_id_dsa_with_sha1, +@@ -1355,19 +1332,6 @@ static const struct signature_alg md5_alg = { + NULL + }; + +-static const struct signature_alg md2_alg = { +- "rsa-md2", +- &asn1_oid_id_rsa_digest_md2, +- &_hx509_signature_md2_data, +- NULL, +- NULL, +- SIG_DIGEST, +- 0, +- EVP_md2, +- evp_md_verify_signature, +- NULL +-}; +- + /* + * Order matter in this structure, "best" first for each "key + * compatible" type (type is ECDSA, RSA, DSA, none, etc) +@@ -1382,13 +1346,11 @@ static const struct signature_alg *sig_algs[] = { + &rsa_with_sha1_alg, + &pkcs1_rsa_sha1_alg, + &rsa_with_md5_alg, +- &rsa_with_md2_alg, + &heim_rsa_pkcs1_x509, + &dsa_sha1_alg, + &sha256_alg, + &sha1_alg, + &md5_alg, +- &md2_alg, + NULL + }; + +@@ -1845,10 +1807,6 @@ hx509_signature_md5(void) + { return &_hx509_signature_md5_data; } + + const AlgorithmIdentifier * +-hx509_signature_md2(void) +-{ return &_hx509_signature_md2_data; } +- +-const AlgorithmIdentifier * + hx509_signature_ecPublicKey(void) + { return &_hx509_signature_ecPublicKey; } + +@@ -1881,10 +1839,6 @@ hx509_signature_rsa_with_md5(void) + { return &_hx509_signature_rsa_with_md5_data; } + + const AlgorithmIdentifier * +-hx509_signature_rsa_with_md2(void) +-{ return &_hx509_signature_rsa_with_md2_data; } +- +-const AlgorithmIdentifier * + hx509_signature_rsa(void) + { return &_hx509_signature_rsa_data; } + +diff --git a/lib/hx509/ks_p11.c b/lib/hx509/ks_p11.c +index 52697f8..8258bd2 100644 +--- a/lib/hx509/ks_p11.c ++++ b/lib/hx509/ks_p11.c +@@ -1139,7 +1139,6 @@ p11_printinfo(hx509_context context, + MECHNAME(CKM_SHA256, "sha256"); + MECHNAME(CKM_SHA_1, "sha1"); + MECHNAME(CKM_MD5, "md5"); +- MECHNAME(CKM_MD2, "md2"); + MECHNAME(CKM_RIPEMD160, "ripemd-160"); + MECHNAME(CKM_DES_ECB, "des-ecb"); + MECHNAME(CKM_DES_CBC, "des-cbc"); +diff --git a/lib/hx509/tst-crypto-available2 b/lib/hx509/tst-crypto-available2 +index b3f76e3..3b1ea6d 100644 +--- a/lib/hx509/tst-crypto-available2 ++++ b/lib/hx509/tst-crypto-available2 +@@ -1,4 +1,3 @@ + 2.16.840.1.101.3.4.2.1 + 1.3.14.3.2.26 + 1.2.840.113549.2.5 +-1.2.840.113549.2.2 +diff --git a/lib/hx509/version-script.map b/lib/hx509/version-script.map +index fbd1d0f..b2b3d82 100644 +--- a/lib/hx509/version-script.map ++++ b/lib/hx509/version-script.map +@@ -201,10 +201,8 @@ HEIMDAL_X509_1.2 { + hx509_revoke_verify; + hx509_set_error_string; + hx509_set_error_stringv; +- hx509_signature_md2; + hx509_signature_md5; + hx509_signature_rsa; +- hx509_signature_rsa_with_md2; + hx509_signature_rsa_with_md5; + hx509_signature_rsa_with_sha1; + hx509_signature_rsa_with_sha256; +-- +1.6.5.GIT + diff --git a/source/lib/libssh/FrugalBuild b/source/lib/libssh/FrugalBuild index 3021183..e7f49d6 100644 --- a/source/lib/libssh/FrugalBuild +++ b/source/lib/libssh/FrugalBuild @@ -17,5 +17,4 @@ source=(http://git.libssh.org/projects/${pkgname}.git/snapshot/${pkgname}-${pkgv sha1sums=('de39ed8b6887377951754edd03c638fdf1cad975') _F_cmake_confopts="-DWITH_SSH1=ON -DWITH_GCRYPT=ON -DWITH_INTERNAL_DOC=ON" Finclude cmake - # optimization OK diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild index 35f96eb..a00d8bf 100644 --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@ -34,8 +34,8 @@ fi pkgname=mesa origname=Mesa _F_archive_name="MesaLib" -pkgver=9.2.1 -pkgrel=1 +pkgver=9.1.6 +pkgrel=2 pkgdesc="Mesa is a 3D graphics library" url="http://mesa3d.sourceforge.net/" up2date="lynx --dump 'ftp://ftp.freedesktop.org/pub/mesa/' | grep "pub/mesa/[0-9\.]" | tail -n1 | sed 's|.*/\([0-9\.]\)|\1|'" @@ -59,7 +59,7 @@ if Fuse DEVEL; then Finclude scm else source=("ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2") - sha1sums=('8e99380ca889cb3a2e01f760cdc9c2b0cf6bae73') + sha1sums=('691757c96b52a67dffeb2547e71fb8c1193ea4ba') fi subpkgs=('libgl' 'mesa-libgl-headers') diff --git a/source/xapps-extra/retroshare/FrugalBuild b/source/xapps-extra/retroshare/FrugalBuild index 4d28a50..5547e34 100644 --- a/source/xapps-extra/retroshare/FrugalBuild +++ b/source/xapps-extra/retroshare/FrugalBuild @@ -6,7 +6,7 @@ pkgver=0.5.5 pkgrel=1 pkgdesc="RetroShare is a Open Source cross-platform, private and secure decentralised \ communication and file sharing platform." -depends=('libssh' 'libupnp' 'openssl' 'gpgme' 'libupnp' 'libxscrnsaver' 'libgnome-keyring' \ +depends=('libupnp' 'openssl' 'gpgme' 'libupnp' 'libxscrnsaver' 'libgnome-keyring' \ 'libqtxml' 'libqtgui' 'libqtnetwork' 'libuuid' 'libqtscript' 'libqtuitools') _F_sourceforge_ext="-0.6864_src.tar.gz" _F_sourceforge_sep="_" @@ -38,8 +38,8 @@ build() { Ficonrel "retroshare-gui/src/gui/images/retrosharelogo2.png" # Desktop File -# _F_desktop_icon="retrosharelogo2.png" -# Fdesktop2 + _F_desktop_icon="retrosharelogo2.png" + Fdesktop2 # bdboot (needed to bootstrap the DHT) Finstallrel 644 "libbitdht/src/bitdht/bdboot.txt" "usr/share/RetroShare/bdboot.txt" diff --git a/source/xmultimedia/vlc/FrugalBuild b/source/xmultimedia/vlc/FrugalBuild index 8d337ed..54fa2f7 100644 --- a/source/xmultimedia/vlc/FrugalBuild +++ b/source/xmultimedia/vlc/FrugalBuild @@ -8,9 +8,9 @@ options+=('asneeded') USE_DEVEL="${USE_DEVEL:-"n"}" pkgname=vlc -pkgver=2.1.0 -pkgextraver= -pkgrel=1 +pkgver=2.0.8 +pkgextraver=a +pkgrel=2 pkgdesc="The cross-platform media player and streaming server." url="http://www.videolan.org/vlc/" depends=('e2fsprogs' 'libxpm>=3.5.8-1' 'libxdmcp' 'libshout' 'avahi' \ @@ -51,7 +51,7 @@ archs=('i686' 'x86_64') up2date="Flasttar http://download.videolan.org/pub/videolan/vlc/last/" if ! Fuse DEVEL; then source=("http://download.videolan.org/pub/videolan/vlc/$pkgver/$pkgname-$pkgver$pkgextraver.tar.xz") - sha1sums=('f6bdf3971f764a9a192f44e4b6363ac482919dc2') + sha1sums=('dce3d05498c68c5aa86b6ed5db37f213a4bdd61c') else pkgver=2.0.0 pkgextraver=-rc1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
