Drop old versions of leafpad, zlib, gnutls, libgcrypt, file
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1074 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
parent
c2a8c31515
commit
cb3389f46d
|
|
@ -1,8 +0,0 @@
|
|||
require file_${PV}.bb
|
||||
inherit native
|
||||
|
||||
# avoid dependency loop
|
||||
DEPENDS = ""
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI += "file://native-fix.diff;patch=1"
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
DESCRIPTION = "File attempts to classify files depending \
|
||||
on their contents and prints a description if a match is found."
|
||||
SECTION = "console/utils"
|
||||
LICENSE = "BSD-ADV"
|
||||
DEPENDS = "file-native"
|
||||
|
||||
SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz"
|
||||
S = "${WORKDIR}/file-${PV}"
|
||||
|
||||
inherit autotools
|
||||
|
||||
do_configure_prepend() {
|
||||
sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am
|
||||
}
|
||||
|
||||
do_stage() {
|
||||
autotools_stage_all
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- gnutls-1.0.23/lib/Makefile.am.orig 2005-06-04 13:46:26.000000000 +0200
|
||||
+++ gnutls-1.0.23/lib/Makefile.am 2005-06-04 13:48:38.000000000 +0200
|
||||
@@ -9,7 +9,7 @@
|
||||
pkgconfig_DATA = gnutls.pc
|
||||
DISTCLEANFILES = $(pkgconfig_DATA)
|
||||
|
||||
-LIBGNUTLS_EXPORTS = -export-symbols-regex '^(_gnutls|gnutls|_E_).*'
|
||||
+LIBGNUTLS_EXPORTS = -export-symbols-regex '^(asn1_|_gnutls|gnutls|_E_).*'
|
||||
|
||||
DIST_SUBDIRS = minitasn1 x509
|
||||
if ENABLE_MINITASN1
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
--- clean/gnutls-1.0.23/libextra/gnutls_openssl.c 2004-08-04 22:36:03.000000000 +0100
|
||||
+++ gnutls-1.0.23/libextra/gnutls_openssl.c 2005-01-02 19:50:49.000000000 +0000
|
||||
@@ -31,7 +31,6 @@
|
||||
|
||||
static int last_error = 0;
|
||||
|
||||
-
|
||||
/* Library initialisation functions */
|
||||
|
||||
int SSL_library_init(void)
|
||||
@@ -219,12 +218,17 @@
|
||||
|
||||
ssl->rfd = (gnutls_transport_ptr)-1;
|
||||
ssl->wfd = (gnutls_transport_ptr)-1;
|
||||
+
|
||||
+ ssl->ssl_peek_buffer = NULL;
|
||||
+ ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0;
|
||||
|
||||
return ssl;
|
||||
}
|
||||
|
||||
void SSL_free(SSL *ssl)
|
||||
{
|
||||
+ if (ssl->ssl_peek_buffer)
|
||||
+ free(ssl->ssl_peek_buffer);
|
||||
gnutls_certificate_free_credentials(ssl->gnutls_cred);
|
||||
gnutls_deinit(ssl->gnutls_state);
|
||||
free(ssl);
|
||||
@@ -245,6 +249,7 @@
|
||||
int SSL_set_fd(SSL *ssl, int fd)
|
||||
{
|
||||
gnutls_transport_set_ptr (ssl->gnutls_state, (gnutls_transport_ptr)fd);
|
||||
+ ssl->rfd = ssl->wfd = fd;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -268,6 +273,16 @@
|
||||
return 1;
|
||||
}
|
||||
|
||||
+int SSL_get_rfd(SSL *ssl)
|
||||
+{
|
||||
+ return ssl->rfd;
|
||||
+}
|
||||
+
|
||||
+int SSL_get_wfd(SSL *ssl)
|
||||
+{
|
||||
+ return ssl->wfd;
|
||||
+}
|
||||
+
|
||||
void SSL_set_bio(SSL *ssl, BIO *rbio, BIO *wbio)
|
||||
{
|
||||
gnutls_transport_set_ptr2 (ssl->gnutls_state, rbio->fd, wbio->fd);
|
||||
@@ -280,6 +295,9 @@
|
||||
|
||||
int SSL_pending(SSL *ssl)
|
||||
{
|
||||
+ if (ssl->ssl_peek_avail)
|
||||
+ return ssl->ssl_peek_avail;
|
||||
+
|
||||
return gnutls_record_check_pending(ssl->gnutls_state);
|
||||
}
|
||||
|
||||
@@ -430,10 +448,49 @@
|
||||
return 1;
|
||||
}
|
||||
|
||||
+int SSL_peek(SSL *ssl, void *buf, int len)
|
||||
+{
|
||||
+ if (len > ssl->ssl_peek_buffer_size) {
|
||||
+ ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len);
|
||||
+ ssl->ssl_peek_buffer_size = len;
|
||||
+ }
|
||||
+
|
||||
+ if (ssl->ssl_peek_avail == 0) {
|
||||
+
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len);
|
||||
+ ssl->last_error = ret;
|
||||
+
|
||||
+ if (ret > 0)
|
||||
+ ssl->ssl_peek_avail += ret;
|
||||
+ }
|
||||
+
|
||||
+ if (len > ssl->ssl_peek_avail)
|
||||
+ len = ssl->ssl_peek_avail;
|
||||
+
|
||||
+ memcpy (buf, ssl->ssl_peek_buffer, len);
|
||||
+
|
||||
+ return len;
|
||||
+}
|
||||
+
|
||||
int SSL_read(SSL *ssl, void *buf, int len)
|
||||
{
|
||||
int ret;
|
||||
|
||||
+ if (ssl->ssl_peek_avail) {
|
||||
+ int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail;
|
||||
+
|
||||
+ memcpy (buf, ssl->ssl_peek_buffer, n);
|
||||
+
|
||||
+ if (ssl->ssl_peek_avail > n)
|
||||
+ memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n);
|
||||
+
|
||||
+ ssl->ssl_peek_avail -= n;
|
||||
+
|
||||
+ return n;
|
||||
+ }
|
||||
+
|
||||
ret = gnutls_record_recv(ssl->gnutls_state, buf, len);
|
||||
ssl->last_error = ret;
|
||||
|
||||
--- clean/gnutls-1.0.23/includes/gnutls/openssl.h 2004-08-04 22:36:02.000000000 +0100
|
||||
+++ gnutls-1.0.23/includes/gnutls/openssl.h 2005-01-02 19:48:35.000000000 +0000
|
||||
@@ -139,6 +139,10 @@
|
||||
|
||||
gnutls_transport_ptr rfd;
|
||||
gnutls_transport_ptr wfd;
|
||||
+
|
||||
+ char *ssl_peek_buffer;
|
||||
+ size_t ssl_peek_buffer_size;
|
||||
+ size_t ssl_peek_avail;
|
||||
} SSL;
|
||||
|
||||
typedef struct
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
DESCRIPTION = "GNU Transport Layer Security Library"
|
||||
DEPENDS = "zlib libgcrypt"
|
||||
PR = "r2"
|
||||
|
||||
LICENSE = "LGPL"
|
||||
|
||||
SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.gz \
|
||||
file://gnutls-openssl.patch;patch=1 \
|
||||
file://export-symbols.patch;patch=1"
|
||||
|
||||
inherit autotools
|
||||
inherit binconfig
|
||||
|
||||
PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin"
|
||||
FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
|
||||
FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
|
||||
FILES_${PN} = "${libdir}/libgnutls.so.*"
|
||||
FILES_${PN}-bin = "${bindir}/gnutls-serv ${bindir}/gnutls-cli \
|
||||
${bindir}/srptool ${bindir}/certtool ${bindir}/gnutls-srpcrypt"
|
||||
FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug"
|
||||
|
||||
EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1"
|
||||
|
||||
do_stage() {
|
||||
oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
|
||||
oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
|
||||
oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
|
||||
autotools_stage_includes
|
||||
|
||||
install -d ${STAGING_DATADIR}/aclocal
|
||||
cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/
|
||||
}
|
||||
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
LICENSE = "GPLv2"
|
||||
DEPENDS = "gtk+ intltool-native"
|
||||
SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz \
|
||||
file://leafpad.desktop \
|
||||
file://leafpad.png"
|
||||
PR = "r1"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
EXTRA_OECONF = " --enable-chooser --disable-gtktest --disable-print"
|
||||
|
||||
do_install_append () {
|
||||
install -d ${D}/${datadir}
|
||||
install -d ${D}/${datadir}/applications
|
||||
install -d ${D}/${datadir}/pixmaps/
|
||||
|
||||
install -m 0644 ${WORKDIR}/leafpad.png ${D}/${datadir}/pixmaps
|
||||
install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications
|
||||
}
|
||||
|
||||
FILES_${PN} += "${datadir}/applications/leafpad.desktop ${datadir}/pixmaps/leafpad.png"
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG"
|
||||
SECTION = "libs"
|
||||
PRIORITY = "optional"
|
||||
LICENSE = "GPL LGPL FDL"
|
||||
DEPENDS = "libgpg-error"
|
||||
|
||||
# move libgcrypt-config into -dev package
|
||||
FILES_${PN} = "${libdir}/lib*.so.*"
|
||||
FILES_${PN}-dev += "${bindir}"
|
||||
|
||||
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz"
|
||||
|
||||
inherit autotools binconfig
|
||||
|
||||
EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
|
||||
|
||||
do_stage() {
|
||||
oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
|
||||
oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
|
||||
install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
|
||||
|
||||
install -d ${STAGING_INCDIR}/
|
||||
for X in gcrypt.h gcrypt-module.h
|
||||
do
|
||||
install -m 0644 src/${X} ${STAGING_INCDIR}/${X}
|
||||
done
|
||||
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
SECTION = "libs"
|
||||
require zlib_${PV}.bb
|
||||
inherit native
|
||||
DEPENDS = ""
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
SECTION = "libs"
|
||||
require zlib_${PV}.bb
|
||||
inherit native
|
||||
DEPENDS = ""
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
DESCRIPTION = "Zlib Compression Library"
|
||||
SECTION = "libs"
|
||||
PRIORITY = "required"
|
||||
HOMEPAGE = "http://www.gzip.org/zlib/"
|
||||
LICENSE = "zlib"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib-${PV}.tar.gz"
|
||||
|
||||
S = "${WORKDIR}/zlib-${PV}"
|
||||
|
||||
export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1"
|
||||
LDFLAGS_append = " -L. -lz"
|
||||
CFLAGS_prepend = "-fPIC "
|
||||
AR_append = " rc"
|
||||
EXTRA_OEMAKE = ""
|
||||
|
||||
do_compile() {
|
||||
./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir}
|
||||
oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a
|
||||
}
|
||||
|
||||
do_stage() {
|
||||
install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h
|
||||
install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h
|
||||
oe_libinstall -a -so libz ${STAGING_LIBDIR}
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${prefix} ${D}${includedir} ${D}${libdir}
|
||||
oe_runmake "prefix=${D}${prefix}" "includedir=${D}${includedir}" \
|
||||
"libdir=${D}${libdir}" install
|
||||
}
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
DESCRIPTION = "Zlib Compression Library"
|
||||
SECTION = "libs"
|
||||
PRIORITY = "required"
|
||||
HOMEPAGE = "http://www.gzip.org/zlib/"
|
||||
LICENSE = "zlib"
|
||||
PR = "r6"
|
||||
|
||||
SRC_URI = "http://www.libpng.org/pub/png/src/zlib-${PV}.tar.gz \
|
||||
file://visibility.patch;patch=1 \
|
||||
file://zlib_1.2.2-8.diff.gz;patch=1 "
|
||||
S = "${WORKDIR}/zlib-${PV}"
|
||||
|
||||
export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1"
|
||||
LDFLAGS_append = " -L. -lz"
|
||||
CFLAGS_prepend = "-fPIC -DZLIB_DLL "
|
||||
AR_append = " rc"
|
||||
EXTRA_OEMAKE = ""
|
||||
|
||||
do_compile() {
|
||||
./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir}
|
||||
oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a
|
||||
}
|
||||
|
||||
do_stage() {
|
||||
install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h
|
||||
install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h
|
||||
oe_libinstall -a -so libz ${STAGING_LIBDIR}
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${prefix} ${D}${includedir} ${D}${libdir}
|
||||
oe_runmake "prefix=${D}${prefix}" \
|
||||
"exec_prefix=${D}${exec_prefix}" \
|
||||
"man3dir=${D}${mandir}/man3" \
|
||||
"includedir=${D}${includedir}" \
|
||||
"libdir=${D}${libdir}" install
|
||||
}
|
||||
Loading…
Reference in New Issue