diff options
| -rw-r--r-- | bzip2/bzip2_1.0.2.oe | 3 | ||||
| -rw-r--r-- | hotplug/hotplug-20030501/busybox.patch (renamed from hotplug/hotplug-2003_05_01-r0/busybox.patch) | 0 | ||||
| -rw-r--r-- | hotplug/hotplug-20030805/busybox.patch (renamed from hotplug/hotplug-2003_08_05/busybox.patch) | 0 | ||||
| -rw-r--r-- | hotplug/hotplug_20030501.oe (renamed from hotplug/hotplug_2003_05_01.oe) | 0 | ||||
| -rw-r--r-- | hotplug/hotplug_20030805.oe (renamed from hotplug/hotplug_2003_08_05.oe) | 0 | ||||
| -rw-r--r-- | less/less_381.oe | 4 | ||||
| -rw-r--r-- | libpcap/libpcap-0.7.2/configure.patch | 43 | ||||
| -rw-r--r-- | libpcap/libpcap-0.7.2/libpcap-shared.patch | 526 | ||||
| -rw-r--r-- | libpcap/libpcap_0.7.2.oe | 5 | ||||
| -rw-r--r-- | nano/nano-1.2.1/configure.patch | 296 | ||||
| -rw-r--r-- | nonworking/libid3tag/libid3tag_0.15.0b.oe (renamed from libid3tag/libid3tag_0.15.0b.oe) | 0 | ||||
| -rw-r--r-- | nonworking/libmad/libmad_0.15.0b.oe (renamed from libmad/libmad_0.15.0b.oe) | 0 | ||||
| -rw-r--r-- | openssh/openssh-3.7.1p2/configure.patch | 23984 | ||||
| -rw-r--r-- | openssh/openssh_3.7.1p1.oe | 6 | ||||
| -rw-r--r-- | openssh/openssh_3.7.1p2.oe | 6 | ||||
| -rw-r--r-- | zsh/zsh_4.1.1.oe | 18 |
16 files changed, 24874 insertions, 17 deletions
diff --git a/bzip2/bzip2_1.0.2.oe b/bzip2/bzip2_1.0.2.oe index be412153f6..8a8ebe8c50 100644 --- a/bzip2/bzip2_1.0.2.oe +++ b/bzip2/bzip2_1.0.2.oe @@ -1,3 +1,6 @@ +DEPENDS = virtual/libc +RDEPENDS = libc6 + SRC_URI = ftp://sources.redhat.com/pub/bzip2/v102/bzip2-${PV}.tar.gz \ file://${FILESDIR}/installpaths.patch;patch=1 diff --git a/hotplug/hotplug-2003_05_01-r0/busybox.patch b/hotplug/hotplug-20030501/busybox.patch index e69de29bb2..e69de29bb2 100644 --- a/hotplug/hotplug-2003_05_01-r0/busybox.patch +++ b/hotplug/hotplug-20030501/busybox.patch diff --git a/hotplug/hotplug-2003_08_05/busybox.patch b/hotplug/hotplug-20030805/busybox.patch index e69de29bb2..e69de29bb2 100644 --- a/hotplug/hotplug-2003_08_05/busybox.patch +++ b/hotplug/hotplug-20030805/busybox.patch diff --git a/hotplug/hotplug_2003_05_01.oe b/hotplug/hotplug_20030501.oe index e69de29bb2..e69de29bb2 100644 --- a/hotplug/hotplug_2003_05_01.oe +++ b/hotplug/hotplug_20030501.oe diff --git a/hotplug/hotplug_2003_08_05.oe b/hotplug/hotplug_20030805.oe index e69de29bb2..e69de29bb2 100644 --- a/hotplug/hotplug_2003_08_05.oe +++ b/hotplug/hotplug_20030805.oe diff --git a/less/less_381.oe b/less/less_381.oe index 510a99f9a3..de2c7f68fe 100644 --- a/less/less_381.oe +++ b/less/less_381.oe @@ -7,10 +7,6 @@ S := ${WORKDIR}/${P} inherit autotools -do_configure () { - chmod 0755 configure -} - do_install () { oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install } diff --git a/libpcap/libpcap-0.7.2/configure.patch b/libpcap/libpcap-0.7.2/configure.patch index e69de29bb2..c5b9d0a897 100644 --- a/libpcap/libpcap-0.7.2/configure.patch +++ b/libpcap/libpcap-0.7.2/configure.patch @@ -0,0 +1,43 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libpcap-0.7.2/./configure.in~configure ++++ libpcap-0.7.2/./configure.in +@@ -7,9 +7,10 @@ + dnl + + AC_REVISION($Revision$) +-AC_INIT(pcap.c) ++AC_INIT ++AC_CONFIG_SRCDIR([pcap.c]) + +-AC_CANONICAL_SYSTEM ++AC_CANONICAL_TARGET([]) + + AC_LBL_C_INIT(V_CCOPT, V_INCLS) + AC_LBL_C_INLINE +@@ -210,11 +211,7 @@ + sinix*) + AC_MSG_CHECKING(if SINIX compiler defines sinix) + AC_CACHE_VAL(ac_cv_cc_sinix_defined, +- AC_TRY_COMPILE( +- [], +- [int i = sinix;], +- ac_cv_cc_sinix_defined=yes, +- ac_cv_cc_sinix_defined=no)) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int i = sinix;]])],[ac_cv_cc_sinix_defined=yes],[ac_cv_cc_sinix_defined=no])) + AC_MSG_RESULT($ac_cv_cc_sinix_defined) + if test $ac_cv_cc_sinix_defined = no ; then + AC_DEFINE(sinix,1,[on sinix]) +@@ -250,7 +247,8 @@ + + AC_CONFIG_HEADER(config.h) + +-AC_OUTPUT(Makefile) ++AC_CONFIG_FILES([Makefile]) ++AC_OUTPUT + + if test -f .devel ; then + make depend diff --git a/libpcap/libpcap-0.7.2/libpcap-shared.patch b/libpcap/libpcap-0.7.2/libpcap-shared.patch index e69de29bb2..18b0250c16 100644 --- a/libpcap/libpcap-0.7.2/libpcap-shared.patch +++ b/libpcap/libpcap-0.7.2/libpcap-shared.patch @@ -0,0 +1,526 @@ +--- libpcap-0.7.2.orig/nametoaddr.c ++++ libpcap-0.7.2/nametoaddr.c +@@ -310,7 +310,7 @@ + e = ep = (u_char *)malloc(6); + + while (*s) { +- if (*s == ':') ++ if (*s == ':' || *s == '.') + s += 1; + d = xdtoi(*s++); + if (isxdigit((unsigned char)*s)) { +--- libpcap-0.7.2.orig/debian/libpcap0.postinst ++++ libpcap-0.7.2/debian/libpcap0.postinst +@@ -0,0 +1,7 @@ ++#! /bin/sh ++ ++if [ "$1" = "configure" ]; then ++ ldconfig ++fi ++ ++#DEBHELPER# +--- libpcap-0.7.2.orig/debian/copyright ++++ libpcap-0.7.2/debian/copyright +@@ -0,0 +1,37 @@ ++This package was debianized by Anand Kumria <wildfire@progsoc.org> on ++Sun, 12 Nov 2000 03:19:44 +1100. ++ ++It was downloaded from http://www.tcpdump.org/ ++ ++Upstream Author(s): patches@tcpdump.org ++ ++Copyright: ++ ++The licence-style of this software is BSD. However this version (0.5) ++fails to include a file containing the licence. A similar version ++of the licence is available in /usr/share/common-licenses/BSD. ++Future versions of libpcap will contain the licence located at ++<URL: http://cvs.tcpdump.org/cgi-bin/cvsweb/libpcap/LICENSE?rev=1.1> ++which is what I describe below. ++ ++The differences are: ++ - Item 3, replace "University" with "Authors" ++ - The LEGALESE (uppercase portion) ends after ++ the words "A PARTICULAR PURPOSE" ++ - The copyright holders are listed below (the CREDITS ++ file is canonical, this is merely a convienent listing) ++ ++people who contributed to libpcap or tcpdump: ++ Bill Fenner <fenner@research.att.com> ++ Assar Westerlund <assar@sics.se> ++ Alexei <kuznet@ms2.inr.ac.ru> ++ Jun-ichiro itojun Hagino <itojun@iijlab.net> ++ Guy Harris <gharris@flashcom.net> ++ Torsten Landschoff <t.landschoff@gmx.net> ++ Michael Richardson <mcr@sandelman.ottawa.on.ca> ++ ++The original LBL crew: ++ Steve McCanne ++ Craig Leres ++ Van Jacobson ++ +--- libpcap-0.7.2.orig/debian/libpcap0.postrm ++++ libpcap-0.7.2/debian/libpcap0.postrm +@@ -0,0 +1,7 @@ ++#! /bin/sh ++ ++if [ "$1" = "remove" ]; then ++ ldconfig ++fi ++ ++#DEBHELPER# +--- libpcap-0.7.2.orig/debian/libpcap-dev.dirs ++++ libpcap-0.7.2/debian/libpcap-dev.dirs +@@ -0,0 +1,4 @@ ++usr/lib ++usr/include ++usr/include/net ++usr/share/man/man3 +--- libpcap-0.7.2.orig/debian/README.Debian ++++ libpcap-0.7.2/debian/README.Debian +@@ -0,0 +1,13 @@ ++libpcap for Debian ++------------------ ++ ++ If you receive messages telling you the packet type is not supported ++ or is deprecated check that CONFIG_PACKET is set to either `Y' or `M'. ++ ++ You should also check that /etc/modules.conf has the line ++ ++ alias net-pf-17 af_packet ++ ++ Feel free to report bugs. ++ ++ -- Anand Kumria <wildfire@progsoc.org>, Tue, 28 Nov 2000 02:04:28 EST +--- libpcap-0.7.2.orig/debian/libpcap0.docs ++++ libpcap-0.7.2/debian/libpcap0.docs +@@ -0,0 +1,2 @@ ++README ++CREDITS +--- libpcap-0.7.2.orig/debian/libpcap0.7.postinst ++++ libpcap-0.7.2/debian/libpcap0.7.postinst +@@ -0,0 +1,8 @@ ++#! /bin/sh ++ ++if [ "$1" = "configure" ]; then ++ ldconfig ++fi ++ ++#DEBHELPER# ++ +--- libpcap-0.7.2.orig/debian/libpcap0.7.postrm ++++ libpcap-0.7.2/debian/libpcap0.7.postrm +@@ -0,0 +1,8 @@ ++#! /bin/sh ++ ++if [ "$1" = "remove" ]; then ++ ldconfig ++fi ++ ++#DEBHELPER# ++ +--- libpcap-0.7.2.orig/debian/changelog ++++ libpcap-0.7.2/debian/changelog +@@ -0,0 +1,135 @@ ++libpcap (0.7.2-1) unstable; urgency=low ++ ++ * New upstream release (closes: #145538). ++ * debian/rules: Build the library with _FILE_OFFSET_BITS set to 64 ++ to allow for files bigger than 2GB (closes: #129213). ++ * Rename the library package to libpcap0.7 and change the SONAME so that we ++ can account for interface changes (closes: #132359). ++ * Run ldconfig as appropriate (lintian). ++ * Remove watch.ex template and the silly symlink from libpcap-dev's ++ documentation to libpcap0 (lintian). ++ ++ -- Torsten Landschoff <torsten@debian.org> Sat, 3 Aug 2002 23:33:56 +0200 ++ ++libpcap (0.6.2-2) unstable; urgency=low ++ ++ * debian/control: Change section of libpcap0 from net to libs ++ (Debian installer message). ++ * aclocal.m4: Treat the ia64 as a cpu which can't handle unaligned ++ memory access (closes: #112152). Thanks for the report go to ++ John R. Daily. ++ ++ -- Torsten Landschoff <torsten@debian.org> Fri, 14 Sep 2001 10:15:52 +0200 ++ ++libpcap (0.6.2-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * debian/control: Removed Build-Depends already satisfied by the ++ build-essential package. ++ * gencode.c (gen_scode): Add the missing default branch of the protocol ++ family switch (closes: 88688). ++ * debian/libpcap.post{rm,inst}: Run ldconfig (lintian). ++ * debian/copyright: Fix the "similiar" typo (lintian). ++ ++ -- Torsten Landschoff <torsten@debian.org> Tue, 6 Mar 2001 04:27:27 +0100 ++ ++libpcap (0.6.1-2) unstable; urgency=low ++ ++ * debian/rules: Changed the shlibs info so that only pcap 0.6 ++ is okay for packages linked against this version. ++ ++ -- Torsten Landschoff <torsten@debian.org> Thu, 18 Jan 2001 01:13:20 +0100 ++ ++libpcap (0.6.1-1) unstable; urgency=low ++ ++ * Taking back the package. Kudos to Anand for helping out. ++ * debian/rules: Pass --enable-ipv6 to configure (closes: #80223). ++ ++ -- Torsten Landschoff <torsten@debian.org> Tue, 16 Jan 2001 15:40:37 +0100 ++ ++libpcap (0.5.2-2) unstable; urgency=low ++ ++ * Update config.guess and config.sub (Closes #26031) ++ * Source builds would not always work. Fix that. ++ * Kernel interface problem is really a module not loaded problem. ++ Note this in README.Debian. (Closes #21356) ++ ++ -- Anand Kumria <wildfire@progsoc.org> Tue, 28 Nov 2000 02:03:25 +1100 ++ ++libpcap (0.5.2-1) unstable; urgency=low ++ ++ * New upstream release ++ * New maintainer ++ * Migrate to Debhelper and insert Build-Depends ++ ++ -- Anand Kumria <wildfire@progsoc.org> Sun, 12 Nov 2000 03:19:44 +1100 ++ ++libpcap (0.4a6-3) unstable; urgency=low ++ ++ * New maintainer. ++ * scanner.l: Allow a 12 digit hex number as ether address as well as ++ BB.BB.BB.BB.BB.BB (closes: #48735) ++ * nametoaddr.c (pcap_ether_aton): Adjust for change in scanner.l ++ ++ -- Torsten Landschoff <torsten@debian.org> Mon, 22 Nov 1999 02:39:45 +0100 ++ ++libpcap (0.4a6-2.1) unstable; urgency=low ++ ++ * Non maintainer upload. ++ config.{guess,sub} changed to recognize a Arm architecture. ++ ++ -- Turbo Fredriksson <turbo@debian.org> Thu, 20 Aug 1998 23:12:36 -0400 ++ ++libpcap (0.4a6-2) frozen unstable; urgency=low ++ ++ * renamed /usr/doc/libpcap to /usr/doc/libpcap0 (should fix several ++ lintian warnings) ++ * updated standards-version ++ * rebuild with latest debmake ++ ++ -- Peter Tobias <tobias@et-inf.fho-emden.de> Mon, 30 Mar 1998 00:46:44 +0200 ++ ++ ++libpcap (0.4a6-1) unstable; urgency=low ++ ++ * upgraded to latest upstream version, fixes: Bug#17164 ++ * added patch from Michael Alan Dorman <mdorman@mdorman.law.miami.edu> ++ for building libpcap on alpha systems, fixes: Bug#15556 ++ * fixed aclocal.m4 script ++ ++ -- Peter Tobias <tobias@et-inf.fho-emden.de> Sat, 31 Jan 1998 23:19:42 +0100 ++ ++ ++libpcap (0.4a2-2) unstable; urgency=low ++ ++ * fixed detection of IFF_LOOPBACK for linux systems ++ * link shared library with -l ++ ++ -- Peter Tobias <tobias@et-inf.fho-emden.de> Wed, 19 Nov 1997 23:44:34 +0100 ++ ++ ++libpcap (0.4a2-1) unstable; urgency=low ++ ++ * new maintainer ++ * latest upstream release ++ * libc6 version ++ * compiled with _REENTRANT ++ ++ -- Peter Tobias <tobias@et-inf.fho-emden.de> Wed, 17 Sep 1997 20:40:01 +0200 ++ ++ ++libpcap (0.3.1a3-1) unstable; urgency=low ++ ++ * Latest upstream release. Fixes bug #6670. ++ ++ -- Karl Sackett <krs@debian.org> Wed, 2 Apr 1997 10:19:28 -0600 ++ ++ ++libpcap (0.3-1) unstable; urgency=low ++ ++ * First Debian release. ++ * Makefile.in: supports libpcap.so target. ++ ++ -- Karl Sackett <krs@debian.org> Wed, 8 Jan 1997 09:38:31 -0600 ++ ++ +--- libpcap-0.7.2.orig/debian/rules ++++ libpcap-0.7.2/debian/rules +@@ -0,0 +1,87 @@ ++#!/usr/bin/make -f ++# Sample debian/rules that uses debhelper. ++# GNU copyright 1997 to 1999 by Joey Hess. ++ ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++ ++# This is the debhelper compatability version to use. ++export DH_COMPAT=2 ++ ++# shared library versions, option 1 ++version=0.7.2 ++major=0.7 ++# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so ++#version=`ls src/.libs/lib*.so.* | \ ++# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` ++#major=`ls src/.libs/lib*.so.* | \ ++# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` ++ ++build: build-stamp ++build-stamp: ++ dh_testdir ++ ++ CFLAGS=-D_FILE_OFFSET_BITS=64 ./configure --prefix=/usr --mandir=\$${prefix}/share/man \ ++ --enable-ipv6 --infodir=\$${prefix}/share/info ++ # Add here commands to compile the package. ++ $(MAKE) ++ ++ touch build-stamp ++ ++clean: ++ dh_testdir ++ dh_testroot ++ rm -f build-stamp ++ ++ # Add here commands to clean up after the build process. ++ -$(MAKE) distclean ++ ++ rm -f net/net ++ ++ dh_clean ++ ++install: build ++ dh_testdir ++ dh_testroot ++ dh_clean -k ++ dh_installdirs ++ ++ $(MAKE) install prefix=`pwd`/debian/libpcap-dev/usr ++ ++# Build architecture-independent files here. ++binary-indep: build install ++# We have nothing to do by default. ++ ++# Build architecture-dependent files here. ++binary-arch: build install ++# dh_testversion ++ dh_testdir ++ dh_testroot ++ # ++ # build libpcap${major} package by moving files from libpcap-dev ++ # ++ dh_movefiles -plibpcap$(major) --sourcedir=debian/libpcap-dev \ ++ usr/lib/libpcap.so.$(major) \ ++ usr/lib/libpcap.so.$(version) ++ ++# dh_installdebconf ++ dh_installdocs ++ dh_installexamples ++ dh_installmenu ++ dh_installmanpages -plibpcap-dev ++ dh_installinfo ++# dh_undocumented ++ dh_installchangelogs CHANGES ++ dh_link -plibpcap-dev ++ dh_strip ++ dh_compress ++ dh_fixperms ++ dh_makeshlibs ++ dh_installdeb ++ dh_shlibdeps ++ dh_gencontrol ++ dh_md5sums ++ dh_builddeb ++ ++binary: binary-indep binary-arch ++.PHONY: build clean binary-indep binary-arch binary install +--- libpcap-0.7.2.orig/debian/control ++++ libpcap-0.7.2/debian/control +@@ -0,0 +1,30 @@ ++Source: libpcap ++Section: devel ++Priority: optional ++Maintainer: Torsten Landschoff <torsten@debian.org> ++Build-Depends: debhelper, flex, bison ++Standards-Version: 3.0.1 ++ ++Package: libpcap-dev ++Section: devel ++Architecture: any ++Depends: libpcap0.7 (= ${Source-Version}), libc6-dev ++Description: Development library for libpcap. ++ Includes headers, static libraries, and documentation. ++ ++Package: libpcap0.7 ++Section: libs ++Architecture: any ++Depends: ${shlibs:Depends} ++Description: System interface for user-level packet capture. ++ libpcap (Packet CAPture) provides a portable framework for low-level ++ network monitoring. Applications include network statistics collection, ++ security monitoring, network debugging, etc. ++ . ++ Since almost every system vendor provides a different interface for ++ packet capture, and since there are several tools that require this ++ functionality, we've created this system-independent API to ease in ++ porting and to alleviate the need for several system-dependent packet ++ capture modules in each application. ++ . ++ Further information is available at <URL: http://www.tcpdump.org/> +--- libpcap-0.7.2.orig/scanner.l ++++ libpcap-0.7.2/scanner.l +@@ -75,6 +75,7 @@ + N ([0-9]+|(0X|0x)[0-9A-Fa-f]+) + B ([0-9A-Fa-f][0-9A-Fa-f]?) + W ([0-9A-Fa-f][0-9A-Fa-f]?[0-9A-Fa-f]?[0-9A-Fa-f]?) ++X [0-9A-Fa-f] + + %a 15000 + %o 17000 +@@ -261,7 +262,7 @@ + {N} { yylval.i = stoi((char *)yytext); return NUM; } + ({N}\.{N})|({N}\.{N}\.{N})|({N}\.{N}\.{N}\.{N}) { + yylval.s = sdup((char *)yytext); return HID; } +-{B}:{B}:{B}:{B}:{B}:{B} { yylval.e = pcap_ether_aton((char *)yytext); ++({B}:{B}:{B}:{B}:{B}:{B})|({B}\.{B}\.{B}\.{B}\.{B}\.{B}) { yylval.e = pcap_ether_aton((char *)yytext); + return EID; } + {V6} { + #ifdef INET6 +@@ -279,6 +280,8 @@ + #endif /*INET6*/ + } + {B}:+({B}:+)+ { bpf_error("bogus ethernet address %s", yytext); } ++{X}{12} { yylval.e = pcap_ether_aton((char *)yytext); return EID;} ++ + icmptype { yylval.i = 0; return NUM; } + icmpcode { yylval.i = 1; return NUM; } + icmp-echoreply { yylval.i = 0; return NUM; } +--- libpcap-0.7.2.orig/Makefile.in ++++ libpcap-0.7.2/Makefile.in +@@ -37,6 +37,15 @@ + srcdir = @srcdir@ + VPATH = @srcdir@ + ++# some defines for shared library compilation - FIXME ++MAJ=0.7 ++MIN=2 ++VERSION=$(MAJ).$(MIN) ++LIBNAME=pcap ++LIBRARY=lib$(LIBNAME).a ++SOLIBRARY=lib$(LIBNAME).so ++SHAREDLIB=$(SOLIBRARY).$(VERSION) ++ + # + # You shouldn't need to edit anything below. + # +@@ -48,6 +57,7 @@ + + # Standard CFLAGS + CFLAGS = $(CCOPT) $(INCLS) $(DEFS) ++CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ) + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -67,7 +77,11 @@ + # problem if you don't own the file but can write to the directory. + .c.o: + @rm -f $@ +- $(CC) $(CFLAGS) -c $(srcdir)/$*.c ++ $(CC) $(CFLAGS) -c -o $@ $(srcdir)/$*.c ++ ++%_pic.o: %.c ++ @rm -f $@ ++ $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c + + PSRC = pcap-@V_PCAP@.c + CSRC = pcap.c inet.c gencode.c optimize.c nametoaddr.c \ +@@ -80,6 +94,7 @@ + # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot + # hack the extra indirection + OBJ = $(PSRC:.c=.o) $(CSRC:.c=.o) $(GENSRC:.c=.o) # $(LIBOBJS) ++OBJ_PIC = $(PSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(GENSRC:.c=_pic.o) + HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ + ethertype.h gencode.h gnuc.h + GENHDR = \ +@@ -91,15 +106,22 @@ + TAGFILES = \ + $(SRC) $(HDR) $(TAGHDR) + +-CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c ++CLEANFILES = $(OBJ) $(OBJ_PIC) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so* + +-all: libpcap.a ++all: libpcap.a $(SHAREDLIB) + + libpcap.a: $(OBJ) + @rm -f $@ + ar rc $@ $(OBJ) + $(RANLIB) $@ + ++$(SHAREDLIB): $(OBJ_PIC) ++ -@rm -f $@ ++ -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ) ++ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc ++ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ) ++ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY) ++ + scanner.c: $(srcdir)/scanner.l + @rm -f $@ + $(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@ +@@ -107,6 +129,9 @@ + scanner.o: scanner.c tokdefs.h + $(CC) $(CFLAGS) -c scanner.c + ++scanner_pic.o: scanner.c tokdefs.h ++ $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c ++ + tokdefs.h: grammar.c + grammar.c: $(srcdir)/grammar.y + @rm -f grammar.c tokdefs.h +@@ -118,9 +143,16 @@ + @rm -f $@ + $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c + ++grammar_pic.o: grammar.c ++ @rm -f $@ ++ $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c ++ + version.o: version.c + $(CC) $(CFLAGS) -c version.c + ++version_pic.o: version.c ++ $(CC) -fPIC $(CFLAGS) -c version.c -o $@ ++ + snprintf.o: $(srcdir)/../tcpdump/missing/snprintf.c + $(CC) $(CFLAGS) -o $@ -c $(srcdir)/../tcpdump/missing/snprintf.c + +@@ -135,10 +167,16 @@ + bpf_filter.o: bpf_filter.c + $(CC) $(CFLAGS) -c bpf_filter.c + ++bpf_filter_pic.o: bpf_filter.c ++ $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@ ++ + install: + [ -d $(DESTDIR)$(libdir) ] || \ + (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) + $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a ++ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/ ++ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ) ++ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY) + $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a + [ -d $(DESTDIR)$(includedir) ] || \ + (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) diff --git a/libpcap/libpcap_0.7.2.oe b/libpcap/libpcap_0.7.2.oe index a7049a31bb..e21a549bd5 100644 --- a/libpcap/libpcap_0.7.2.oe +++ b/libpcap/libpcap_0.7.2.oe @@ -12,6 +12,11 @@ S=${WORKDIR}/libpcap-${PV} inherit autotools EXTRA_OECONF=" --with-pcap=linux" +do_configure_prepend () { + if [ ! -e acinclude.m4 ]; then + cat aclocal.m4 > acinclude.m4 + fi +} do_stage () { install -d ${STAGING_DIR}/target/include/net diff --git a/nano/nano-1.2.1/configure.patch b/nano/nano-1.2.1/configure.patch index ad900c5a69..6576292614 100644 --- a/nano/nano-1.2.1/configure.patch +++ b/nano/nano-1.2.1/configure.patch @@ -64,27 +64,25 @@ AC_MSG_RESULT(no) # We might need the term library for termlib in ncurses curses termcap terminfo termlib; do -@@ -220,7 +220,8 @@ +@@ -220,7 +220,7 @@ AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap]) LIBS="$LIBS $tcap" - AC_TRY_RUN([ -+ _au_changequote([,]) +AC_TRY_RUN([ #include <stdio.h> #include <slcurses.h> int main () { SLtt_initialize (NULL); return 0; }], -@@ -237,7 +238,8 @@ +@@ -237,7 +237,7 @@ # We might need the math library AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap -lm]) LIBS="$LIBS -lm" - AC_TRY_RUN([ -+ _au_changequote([,]) +AC_TRY_RUN([ #include <stdio.h> #include <slcurses.h> int main () { SLtt_initialize (NULL); return 0; }], -@@ -252,8 +254,7 @@ +@@ -252,8 +252,7 @@ CURSES_LIB_NAME=slang], [AC_MSG_RESULT(no)], AC_MSG_WARN([*** Can not use slang when cross-compiling]))], @@ -94,7 +92,7 @@ AC_MSG_ERROR([ *** The header file slcurses.h was not found. If you wish to use *** slang support this header file is required. Please either -@@ -334,12 +335,11 @@ +@@ -334,12 +333,11 @@ # Taken from aumix (can't tell from the variable name?) AC_CACHE_CHECK([for private member _use_keypad in WINDOW], aumix_cv_struct_window_usekeypad, @@ -111,7 +109,198 @@ AC_DEFINE(HAVE_USEKEYPAD, 1, [Define this if your curses lib has the _use_keypad flag.]) --- nano-1.2.1/configure~configure +++ nano-1.2.1/configure -@@ -5290,6 +5290,7 @@ +@@ -310,7 +310,7 @@ + # include <unistd.h> + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB CPP EGREP GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS CURSES_LIB LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB CPP EGREP GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS CURSES_LIB LIBOBJS LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -1314,7 +1314,7 @@ + + + +-am__api_version="1.6" ++am__api_version="1.7" + ac_aux_dir= + for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then +@@ -1558,6 +1558,15 @@ + SET_MAKE="MAKE=${MAKE-make}" + fi + ++rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++ + # test to see if srcdir already configured + if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then +@@ -1566,9 +1575,19 @@ + { (exit 1); exit 1; }; } + fi + ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++ ++ + # Define the identity of the package. +- PACKAGE=nano +- VERSION=1.2.1 ++ PACKAGE='nano' ++ VERSION='1.2.1' + + + cat >>confdefs.h <<_ACEOF +@@ -1694,15 +1713,11 @@ + + + +-# Add the stamp file to the list of files AC keeps track of, +-# along with our hook. + ac_config_headers="$ac_config_headers config.h:config.h.in" + + + + +- +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -2570,24 +2585,16 @@ + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +-rm -f .deps 2>/dev/null +-mkdir .deps 2>/dev/null +-if test -d .deps; then +- DEPDIR=.deps +-else +- # MS-DOS does not allow filenames that begin with a dot. +- DEPDIR=_deps +-fi +-rmdir .deps 2>/dev/null +- ++DEPDIR="${am__leading_dot}deps" + + ac_config_commands="$ac_config_commands depfiles" + + + am_make=${MAKE-make} + cat > confinc << 'END' +-doit: ++am__doit: + @echo done ++.PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. + echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +@@ -2602,7 +2609,7 @@ + # In particular we don't look at `^make:' because GNU make might + # be invoked under some other name (usually "gmake"), in which + # case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +@@ -2662,18 +2669,32 @@ + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. +- echo '#include "conftest.h"' > conftest.c +- echo 'int i;' > conftest.h +- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ : > sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) +@@ -2691,13 +2712,20 @@ + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=conftest.c object=conftest.o \ +- depfile=conftest.Po tmpdepfile=conftest.TPo \ +- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && +- grep conftest.h conftest.Po > /dev/null 2>&1 && ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- am_cv_CC_dependencies_compiler_type=$depmode +- break ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored. ++ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else ++ am_cv_CC_dependencies_compiler_type=$depmode ++ break ++ fi + fi + done + +@@ -2714,6 +2742,18 @@ + + + ++if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then ++ am__fastdepCC_TRUE= ++ am__fastdepCC_FALSE='#' ++else ++ am__fastdepCC_TRUE='#' ++ am__fastdepCC_FALSE= ++fi ++ ++ ++ + + echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 + echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 +@@ -5290,6 +5330,7 @@ done @@ -119,7 +308,7 @@ if test "${ac_cv_header_regex_h+set}" = set; then echo "$as_me:$LINENO: checking for regex.h" >&5 echo $ECHO_N "checking for regex.h... $ECHO_C" >&6 -@@ -5422,7 +5423,10 @@ +@@ -5422,7 +5463,10 @@ if test $ac_cv_header_regex_h = yes; then echo "$as_me:$LINENO: checking for broken regexec" >&5 echo $ECHO_N "checking for broken regexec... $ECHO_C" >&6 @@ -131,7 +320,7 @@ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling -@@ -5472,6 +5476,10 @@ +@@ -5472,6 +5516,10 @@ fi fi @@ -142,26 +331,107 @@ -@@ -6037,7 +6045,8 @@ +@@ -6037,7 +6085,7 @@ echo "$as_me:$LINENO: checking for SLtt_initialize in -lslang $tcap" >&5 echo $ECHO_N "checking for SLtt_initialize in -lslang $tcap... $ECHO_C" >&6 LIBS="$LIBS $tcap" - if test "$cross_compiling" = yes; then -+ _au_changequote(,) +if test "$cross_compiling" = yes; then { echo "$as_me:$LINENO: WARNING: *** Can not use slang when cross-compiling" >&5 echo "$as_me: WARNING: *** Can not use slang when cross-compiling" >&2;} else -@@ -6091,7 +6100,8 @@ +@@ -6091,7 +6139,7 @@ echo "$as_me:$LINENO: checking for SLtt_initialize in -lslang $tcap -lm" >&5 echo $ECHO_N "checking for SLtt_initialize in -lslang $tcap -lm... $ECHO_C" >&6 LIBS="$LIBS -lm" - if test "$cross_compiling" = yes; then -+ _au_changequote(,) +if test "$cross_compiling" = yes; then { echo "$as_me:$LINENO: WARNING: *** Can not use slang when cross-compiling" >&5 echo "$as_me: WARNING: *** Can not use slang when cross-compiling" >&2;} else +@@ -7671,6 +7719,13 @@ + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. ++Usually this means the m |