From bc924b61431ffa6c76db5fefa7a5a09951fe6ccb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 28 Apr 2010 20:30:39 +0200 Subject: fix some pkg dependencies --- package/MesaLib/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 41506092d..26201ba0d 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -9,9 +9,10 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 62e8e47cbd63741b4bbe634dcdc8a56a PKG_DESCR:= MESA library PKG_SECTION:= libs -PKG_DEPENDS:= libxdamage libxfixes -PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm -PKG_URL:= add project url +PKG_DEPENDS:= libxdamage libxfixes libdrm +PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm libdrm +PKG_BUILDDEP+= dri2proto glproto +PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.1/ WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} -- cgit v1.2.3 From c7918465e6c9834556eb9238271951f2184e058a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 May 2010 11:42:21 +0200 Subject: fix firefox build for eglibc/glibc builds --- package/firefox/Makefile | 2 +- package/firefox/patches/patch-gfx_qcms_iccread_c | 18 ++++++++++++++++++ package/firefox/patches/patch-gfx_qcms_qcmstypes_h | 5 +++-- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 package/firefox/patches/patch-gfx_qcms_iccread_c (limited to 'package') diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 8c6db24be..b8d667241 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -19,7 +19,7 @@ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 WRKDIST= ${WRKDIR}/mozilla-1.9.2 -PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle +PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle ibmx40 include $(TOPDIR)/mk/package.mk diff --git a/package/firefox/patches/patch-gfx_qcms_iccread_c b/package/firefox/patches/patch-gfx_qcms_iccread_c new file mode 100644 index 000000000..ea9ab6234 --- /dev/null +++ b/package/firefox/patches/patch-gfx_qcms_iccread_c @@ -0,0 +1,18 @@ +--- mozilla-1.9.2.orig/gfx/qcms/iccread.c 2010-04-02 18:02:27.000000000 +0200 ++++ mozilla-1.9.2/gfx/qcms/iccread.c 2010-04-30 14:00:52.430967966 +0200 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include "qcmsint.h" + + //XXX: use a better typename +@@ -771,7 +772,6 @@ void qcms_profile_release(qcms_profile * + qcms_profile_fini(profile); + } + +-#include + qcms_profile* qcms_profile_from_file(FILE *file) + { + uint32_t length, remaining_length; diff --git a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h index 436b1a452..80f68661a 100644 --- a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h +++ b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h @@ -1,6 +1,6 @@ --- mozilla-1.9.2.orig/gfx/qcms/qcmstypes.h 2010-04-02 18:02:27.000000000 +0200 -+++ mozilla-1.9.2/gfx/qcms/qcmstypes.h 2010-04-11 14:57:54.000000000 +0200 -@@ -11,22 +11,11 @@ ++++ mozilla-1.9.2/gfx/qcms/qcmstypes.h 2010-04-30 17:58:33.490975825 +0200 +@@ -11,22 +11,12 @@ /* int_types.h gets included somehow, so avoid redefining the types differently */ #include #else @@ -13,6 +13,7 @@ -typedef PRInt64 int64_t; -typedef PRUint64 uint64_t; - ++#include #ifdef __OS2__ /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ #include -- cgit v1.2.3 From d6bcad0afc7bccdc355d4aeab35ffd35c704fc69 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 May 2010 11:42:44 +0200 Subject: mesa is ibmx40 only right now --- package/MesaLib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package') diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 26201ba0d..9d673613f 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -17,7 +17,7 @@ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.1/ WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} -PKG_TARGET_DEPENDS:= x86 x86_64 +PKG_TARGET_DEPENDS:= ibmx40 include $(TOPDIR)/mk/package.mk -- cgit v1.2.3 From eb6db01362bbbb6664697635fc7057d712e966da Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 May 2010 11:43:07 +0200 Subject: update to latest upstream version --- package/openvpn/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index e8af513fe..330b25124 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= openvpn -PKG_VERSION:= 2.1.0 +PKG_VERSION:= 2.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 452a83326ae198cf961e9ae02539c8fb +PKG_MD5SUM:= b273ed2b5ec8616fb9834cde8634bce7 PKG_DESCR:= Open Source VPN solution using SSL PKG_SECTION:= net PKG_DEPENDS:= kmod-tun -- cgit v1.2.3 From 5ebef62334e54209fe6852d4fd2dca4b0ece6d5a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 May 2010 11:44:00 +0200 Subject: do not select fuse on a bool symbol --- package/davfs2/Config.in.kernel | 4 ---- package/davfs2/Makefile | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'package') diff --git a/package/davfs2/Config.in.kernel b/package/davfs2/Config.in.kernel index 3ef8e77d7..70e3c3ea4 100644 --- a/package/davfs2/Config.in.kernel +++ b/package/davfs2/Config.in.kernel @@ -4,13 +4,9 @@ depends on ADK_PACKAGE_DAVFS2 config ADK_PACKAGE_DAVFS2_FUSE bool "use the FUSE filesystem interface" - select ADK_PACKAGE_FUSE_UTILS config ADK_PACKAGE_DAVFS2_CODA bool "use the CODA filesystem interface" - select ADK_KPACKAGE_KMOD_CODA_FS config ADK_PACKAGE_DAVFS2_BOTH bool "use both filesystem interfaces" - select ADK_PACKAGE_FUSE_UTILS - select ADK_KPACKAGE_KMOD_CODA_FS endchoice diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index b3e63f2c9..b6c026739 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -16,8 +16,6 @@ endif PKG_URL:= http://savannah.nongnu.org/projects/davfs2 PKG_SITES= ${MASTER_SITE_SOURCEFORGE:=dav/} -include ${TOPDIR}/mk/package.mk - ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y) PKG_DEPENDS:= fuse-utils kmod-fuse-fs libiconv neon else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y) @@ -26,6 +24,8 @@ else PKG_DEPENDS:= kmod-coda-fs fuse-utils kmod-fuse-fs libiconv neon endif +include ${TOPDIR}/mk/package.mk + $(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --with-neon -- cgit v1.2.3 From 4ef1a744af6d9fe1ab993c19a9e58cd83c37c2f1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 May 2010 18:04:12 +0200 Subject: fix make bulkallmod for some packages and target combinations --- package/gdb/Makefile | 2 ++ package/gdbserver/Makefile | 2 ++ package/nspr/Makefile | 7 ++++++- .../patch-mozilla_nsprpub_config_Makefile_in | 4 ++-- .../nspr/patches/patch-mozilla_nsprpub_configure | 21 +++++++++++++++++++++ package/nss/Makefile | 6 +++--- 6 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 package/nspr/patches/patch-mozilla_nsprpub_configure (limited to 'package') diff --git a/package/gdb/Makefile b/package/gdb/Makefile index e01721222..d98546426 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -10,6 +10,8 @@ PKG_DEPENDS:= libthread-db libncurses libiconv PKG_BUILDDEP+= ncurses readline libiconv PKG_TARGET_DEPENDS:= !foxboard !ag241 +PKG_NOPARALLEL:= 1 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index cfbed5260..32ce9fd59 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -8,6 +8,8 @@ PKG_DESCR:= GNU debugger (small server) PKG_SECTION:= comp PKG_DEPENDS:= libthread-db +PKG_TARGET_DEPENDS:= !foxboard + include ${TOPDIR}/mk/package.mk WRKSRC= ${WRKDIST}/gdb/gdbserver diff --git a/package/nspr/Makefile b/package/nspr/Makefile index 9072977a1..9383c8c5f 100644 --- a/package/nspr/Makefile +++ b/package/nspr/Makefile @@ -20,7 +20,12 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,NSPR,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ENV+= OS_TARGET="Linux" HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" +CONFIGURE_ENV+= OS_TARGET="Linux" HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \ + cross_compiling=yes + +ifeq (${ADK_LINUX_64},y) +CONFIGURE_ARGS+= --enable-64bit +endif post-install: $(INSTALL_DIR) $(IDIR_NSPR)/usr/lib diff --git a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in index 40d15376f..f667eeb61 100644 --- a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in +++ b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in @@ -1,11 +1,11 @@ --- nspr-4.8.2.orig/mozilla/nsprpub/config/Makefile.in 2009-03-03 23:04:23.000000000 +0100 -+++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in 2010-02-06 02:01:27.321836181 +0100 ++++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in 2010-05-02 12:25:27.673464050 +0200 @@ -145,7 +145,7 @@ endif $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) - $(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ -+ $(CC_FOR_BUILD) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ ++ $(CC_FOR_BUILD) $(HOSTCFLAGS) $< $(HOSTLDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ install:: nspr.m4 $(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal diff --git a/package/nspr/patches/patch-mozilla_nsprpub_configure b/package/nspr/patches/patch-mozilla_nsprpub_configure new file mode 100644 index 000000000..3d048970b --- /dev/null +++ b/package/nspr/patches/patch-mozilla_nsprpub_configure @@ -0,0 +1,21 @@ +--- nspr-4.8.2.orig/mozilla/nsprpub/configure 2009-10-04 02:57:00.000000000 +0200 ++++ nspr-4.8.2/mozilla/nsprpub/configure 2010-05-02 12:55:21.842224375 +0200 +@@ -1129,8 +1129,8 @@ EOF + fi + + if test -z "$SKIP_COMPILER_CHECKS"; then +-if test "$target" != "$host"; then +- echo "cross compiling from $host to $target" ++if test "$target" != "$build"; then ++ echo "cross compiling from $build to $target" + cross_compiling=yes + + _SAVE_CC="$CC" +@@ -2593,6 +2593,7 @@ case "$build:$target" in + ;; + esac + ++cross_compiling=yes + if test "$cross_compiling" = "yes"; then + CROSS_COMPILE=1 + else diff --git a/package/nss/Makefile b/package/nss/Makefile index 28e4da1f8..7acbacbe4 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -26,7 +26,7 @@ CONFIG_STYLE:= manual ifeq ($(ADK_LINUX_64),y) TCFLAGS+= -DUSE_64 -MAKE_FLAGS+= USE_64=1 +XAKE_FLAGS+= USE_64=1 endif MAKE_FLAGS+= NATIVE_CC="${HOSTCC}" NATIVE_FLAGS="${HOSTCFLAGS}" @@ -34,10 +34,10 @@ TCPPFLAGS+= -I${STAGING_DIR}/usr/include/nspr TCFLAGS+= -I${STAGING_DIR}/usr/include/nspr TLDFLAGS:= '' -MAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \ +XAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \ ARCHFLAG="${TCFLAGS} ${TCPPFLAGS} -ldl" ALL_TARGET:= build_coreconf all -XAKE_FLAGS+= OS_TEST=${ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6 +XAKE_FLAGS+= OS_TEST=${CPU_ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6 post-install: $(INSTALL_DIR) $(IDIR_NSS)/usr/lib -- cgit v1.2.3 From 8a325b2af866300353e500e9693fc08991df52b7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 16 May 2010 13:15:00 +0200 Subject: add preliminary support for my pcmcia smartcard reader --- package/Config.in | 4 ++++ package/base-files/src/lib/mdev/init | 6 +++++ package/ccid/Makefile | 28 +++++++++++++++++++++++ package/opensc/Makefile | 5 +++-- package/pcmciautils/Makefile | 32 ++++++++++++++++++++++++++ package/pcmciautils/files/config.opts | 34 ++++++++++++++++++++++++++++ package/pcmciautils/patches/patch-Makefile | 11 +++++++++ package/pcsc-lite/Makefile | 36 ++++++++++++++++++++++++++++++ package/pcsc-lite/files/pcscd.init | 27 ++++++++++++++++++++++ package/pcsc-lite/files/pcscd.postinst | 3 +++ package/pcsc-lite/files/reader.conf | 16 +++++++++++++ package/sysfsutils/Makefile | 27 ++++++++++++++++++++++ 12 files changed, 227 insertions(+), 2 deletions(-) create mode 100644 package/ccid/Makefile create mode 100644 package/pcmciautils/Makefile create mode 100644 package/pcmciautils/files/config.opts create mode 100644 package/pcmciautils/patches/patch-Makefile create mode 100644 package/pcsc-lite/Makefile create mode 100644 package/pcsc-lite/files/pcscd.init create mode 100644 package/pcsc-lite/files/pcscd.postinst create mode 100644 package/pcsc-lite/files/reader.conf create mode 100644 package/sysfsutils/Makefile (limited to 'package') diff --git a/package/Config.in b/package/Config.in index 5f1a0bdd4..265e222fd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -56,6 +56,7 @@ source "package/xz/Config.in" endmenu menu "Cryptography" +source "package/ccid/Config.in" source "package/cryptsetup/Config.in" source "package/gnupg/Config.in" source "package/gnutls/Config.in" @@ -65,6 +66,7 @@ source "package/openct/Config.in" source "package/opensc/Config.in" source "package/openssl/Config.in" source "package/openssl-pkcs11/Config.in" +source "package/pcsc-lite/Config.in" source "package/rng-tools/Config.in" endmenu @@ -579,9 +581,11 @@ source "package/hdparm/Config.in" source "package/usbutils/Config.in" source "package/patch/Config.in" source "package/pciutils/Config.in" +source "package/pcmciautils/Config.in" source "package/procps/Config.in" source "package/sispmctl/Config.in" source "package/stress/Config.in" +source "package/sysfsutils/Config.in" source "package/sysstat/Config.in" source "package/swconfig/Config.in" source "package/udev/Config.in" diff --git a/package/base-files/src/lib/mdev/init b/package/base-files/src/lib/mdev/init index de368c80c..eec8242a1 100644 --- a/package/base-files/src/lib/mdev/init +++ b/package/base-files/src/lib/mdev/init @@ -14,3 +14,9 @@ if [ "$SUBSYSTEM" == "firmware" ];then fi fi fi +if [ "$SUBSYSTEM" == "pcmcia_socket" ];then + logger "Setting up PCMCIA socket resource database" + if [ "$ACTION" == "add" ];then + /usr/sbin/pcmcia-socket-startup + fi +fi diff --git a/package/ccid/Makefile b/package/ccid/Makefile new file mode 100644 index 000000000..2e63a888c --- /dev/null +++ b/package/ccid/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= ccid +PKG_VERSION:= 1.3.12 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 7fcdbacacd955659286f988fa9b6e0be +PKG_DESCR:= a generic USB CCID and ICCD driver +PKG_SECTION:= security +PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html +PKG_SITES:= https://alioth.debian.org/frs/download.php/3281/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,CCID,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --enable-twinserial + +post-install: + $(INSTALL_DIR) $(IDIR_CCID)/usr/pcsc/drivers/serial + $(CP) $(WRKINST)/usr/pcsc/drivers/serial/libccidtwin.so* \ + $(IDIR_CCID)/usr/pcsc/drivers/serial + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 702a38751..2cf89050e 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -4,11 +4,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= opensc -PKG_VERSION:= 0.11.8 +PKG_VERSION:= 0.11.13 PKG_RELEASE:= 1 -PKG_MD5SUM:= a269b478b18dddb648b9bd930206b5a8 +PKG_MD5SUM:= 98fa151e947941f9c3f27420fdf47c11 PKG_DESCR:= a set of libraries and utilities to access smart cards PKG_SECTION:= crypto +PKG_BUILDDEP+= libtool PKG_URL:= http://www.opensc-project.org/opensc PKG_SITES:= http://www.opensc-project.org/files/opensc/ diff --git a/package/pcmciautils/Makefile b/package/pcmciautils/Makefile new file mode 100644 index 000000000..d99b1a7d1 --- /dev/null +++ b/package/pcmciautils/Makefile @@ -0,0 +1,32 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= pcmciautils +PKG_VERSION:= 017 +PKG_RELEASE:= 1 +PKG_MD5SUM:= ee5837214d297661c8b8189055a351fc +PKG_DESCR:= Utilities for PCMCIA subsystem +PKG_SECTION:= utils +PKG_BUILDDEP+= sysfsutils +PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html +PKG_SITES:= http://www.kernel.org/pub/linux/utils/kernel/pcmcia/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PCMCIAUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE= manual + +post-install: + $(INSTALL_DIR) $(IDIR_PCMCIAUTILS)/etc/pcmcia + $(INSTALL_DATA) ./files/config.opts \ + $(IDIR_PCMCIAUTILS)/etc/pcmcia + $(INSTALL_DIR) $(IDIR_PCMCIAUTILS)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/sbin/pccardctl \ + $(IDIR_PCMCIAUTILS)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/lib/udev/pcmcia-socket-startup \ + $(IDIR_PCMCIAUTILS)/usr/sbin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pcmciautils/files/config.opts b/package/pcmciautils/files/config.opts new file mode 100644 index 000000000..868ab48c4 --- /dev/null +++ b/package/pcmciautils/files/config.opts @@ -0,0 +1,34 @@ +# +# Local PCMCIA Configuration File +# +#---------------------------------------------------------------------- +# +# System resources available for PCMCIA cards +# +# NOTE: these settings have no effect on resources assigned to a +# CardBus bridge device itself; this file only affects resources +# assigned to cards. Also, interrupt settings here will only affect +# ISA bus interrupts assigned to 16-bit cards. PCI interrupts +# generally can't be reconfigured. +# +# With the kernel PCMCIA subsystem, these settings also have no effect +# at all on resources used for 32-bit CardBus cards. Those are set by +# the PCI hotplug subsystem. +# + +include port 0x100-0x3af +include port 0x3e0-0x4ff +include port 0x820-0x8ff +include port 0xc00-0xcf7 + +include memory 0xc0000-0xfffff +include memory 0xa0000000-0xa0ffffff +include memory 0x60000000-0x60ffffff + +# These may hurt on FSC. +# include port 0x3c0-0x3d2 +# Exclude 0x3d3 as Radeon IGP MCE's if you touch these ports +# include port 0x3d4-0x3df + +# High port numbers do not always work... +# include port 0x1000-0x17ff diff --git a/package/pcmciautils/patches/patch-Makefile b/package/pcmciautils/patches/patch-Makefile new file mode 100644 index 000000000..821753ddc --- /dev/null +++ b/package/pcmciautils/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- pcmciautils-017.orig/Makefile 2010-01-06 16:47:45.000000000 +0100 ++++ pcmciautils-017/Makefile 2010-05-13 14:06:30.741613760 +0200 +@@ -94,7 +94,7 @@ PWD = $(shell pwd) + # If you are running a cross compiler, you may want to set this + # to something more interesting, like "arm-linux-". If you want + # to compile vs uClibc, that can be done here as well. +-CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- ++CROSS ?= #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- + CC = $(CROSS)gcc + LD = $(CROSS)gcc + AR = $(CROSS)ar diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile new file mode 100644 index 000000000..b81a64d27 --- /dev/null +++ b/package/pcsc-lite/Makefile @@ -0,0 +1,36 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= pcsc-lite +PKG_VERSION:= 1.6.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= fc3fd0e83090ecc81e5b32700fa246c2 +PKG_DESCR:= middleware for smartcards +PKG_SECTION:= security +PKG_BUILDDEP+= libusb libusb-compat +PKG_DEPENDS:= libusb libusb-compat libpthread ccid +PKG_URL:= http://pcsclite.alioth.debian.org/ +PKG_SITES:= https://alioth.debian.org/frs/download.php/3279/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PCSC_LITE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --disable-libhal + +post-install: + $(INSTALL_DIR) $(IDIR_PCSC_LITE)/etc + $(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/sbin + $(INSTALL_DIR) $(IDIR_PCSC_LITE)/usr/lib + $(INSTALL_DATA) ./files/reader.conf \ + $(IDIR_PCSC_LITE)/etc + $(INSTALL_BIN) $(WRKINST)/usr/sbin/pcscd \ + $(IDIR_PCSC_LITE)/usr/sbin + $(CP) $(WRKINST)/usr/lib/libpcsclite.so* \ + $(IDIR_PCSC_LITE)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pcsc-lite/files/pcscd.init b/package/pcsc-lite/files/pcscd.init new file mode 100644 index 000000000..557762eca --- /dev/null +++ b/package/pcsc-lite/files/pcscd.init @@ -0,0 +1,27 @@ +#!/bin/sh +#PKG pcscd +#INIT 80 + +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${pcscd:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + pcscd + ;; +stop) + pkill pcscd + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "usage: $0 {start | stop | restart}" + ;; +esac +exit $? diff --git a/package/pcsc-lite/files/pcscd.postinst b/package/pcsc-lite/files/pcscd.postinst new file mode 100644 index 000000000..1b27f479d --- /dev/null +++ b/package/pcsc-lite/files/pcscd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf pcscd pcscd NO diff --git a/package/pcsc-lite/files/reader.conf b/package/pcsc-lite/files/reader.conf new file mode 100644 index 000000000..f56f290fb --- /dev/null +++ b/package/pcsc-lite/files/reader.conf @@ -0,0 +1,16 @@ +# FRIENDLYNAME Any name +# DEVICENAME device filename used by the reader: +# /dev/ttyS0 for the first serial port +# or /dev/null if this is not used by the driver +# LIBPATH Location of the driver library for your reader +# CHANNELID +# 0x0103F8 or 1 for /dev/ttyS0 (COM1) +# 0x0102F8 or 2 for /dev/ttyS1 (COM2) +# 0x0103E8 or 3 for /dev/ttyS2 (COM3) +# 0x0102E8 or 4 for /dev/ttyS3 (COM4) +# + +FRIENDLYNAME "GemPCTwin serial" +DEVICENAME /dev/ttyS0 +LIBPATH /usr/pcsc/drivers/serial/libccidtwin.so +CHANNELID 0 diff --git a/package/sysfsutils/Makefile b/package/sysfsutils/Makefile new file mode 100644 index 000000000..33bc0b905 --- /dev/null +++ b/package/sysfsutils/Makefile @@ -0,0 +1,27 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= sysfsutils +PKG_VERSION:= 2.1.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 14e7dcd0436d2f49aa403f67e1ef7ddc +PKG_DESCR:= utilites built upon sysfs +PKG_SECTION:= utils +PKG_URL:= http://linux-diag.sourceforge.net/Sysfsutils.html +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=linux-diag/sysfsutils/2.1.0/} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,SYSFSUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +post-install: + $(INSTALL_DIR) $(IDIR_SYSFSUTILS)/usr/bin + $(INSTALL_DIR) $(IDIR_SYSFSUTILS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libsysfs.so* \ + $(IDIR_SYSFSUTILS)/usr/lib + $(INSTALL_BIN) $(WRKINST)/usr/bin/systool \ + $(IDIR_SYSFSUTILS)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 896b6bb853f900eaebd56447df16958bf15916db Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 May 2010 18:55:17 +0200 Subject: activate and refresh support for rb411/rb433 after n0-1 helped to find a way to fix my broken rb433 by using the primary bootloader via shortening a jumper I got the motivation to get this target working again. Summarize both targets to newly created rb4xx target. --- package/adkinstall/Makefile | 8 +++++++- package/base-files/src/sbin/adkupdate | 4 ++++ package/cfgfs/Makefile | 2 +- package/nand/Makefile | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile index 5a1823cc3..944c073fb 100644 --- a/package/adkinstall/Makefile +++ b/package/adkinstall/Makefile @@ -10,7 +10,7 @@ PKG_DESCR:= installer for cf, mmc, sd or mtd devices PKG_SECTION:= base PKG_DEPENDS:= parted sfdisk e2fsprogs -PKG_TARGET_DEPENDS:= alix wrap rb532 foxg20 +PKG_TARGET_DEPENDS:= alix wrap rb532 foxg20 rb411 rb433 WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 @@ -34,6 +34,12 @@ ifeq ($(ADK_LINUX_MIPS_RB532),y) else ifeq ($(ADK_LINUX_ARM_FOXBOARD),y) ${INSTALL_BIN} ./src/adkinstall.foxg20 \ $(IDIR_ADKINSTALL)/sbin/adkinstall +else ifeq ($(ADK_LINUX_MIPS_RB433),y) + ${INSTALL_BIN} ./src/adkinstall.rb4xx \ + $(IDIR_ADKINSTALL)/sbin/adkinstall +else ifeq ($(ADK_LINUX_MIPS_RB411),y) + ${INSTALL_BIN} ./src/adkinstall.rb4xx \ + $(IDIR_ADKINSTALL)/sbin/adkinstall else ${INSTALL_BIN} ./src/adkinstall $(IDIR_ADKINSTALL)/sbin endif diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate index 1af188b41..dd8d3ecec 100755 --- a/package/base-files/src/sbin/adkupdate +++ b/package/base-files/src/sbin/adkupdate @@ -34,6 +34,8 @@ prepare() { mount -o remount,rw / if [ "$system" == "RB532" ];then mount -t yaffs2 /dev/mtdblock0 /boot + elif [ "$system" == "AR7130" ];then + mount -t yaffs2 /dev/mtdblock1 /boot elif [ "$system" == "FOXG20" ];then mount -t vfat /dev/mmcblk0p1 /boot fi @@ -89,6 +91,8 @@ if [ -x /sbin/cfgfs ];then fi if [ "$system" == "RB532" ];then umount -f /boot +elif [ "$system" == "AR7130" ];then + umount -f /boot elif [ "$system" == "FOXG20" ];then umount -f /boot fi diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 1b9897807..4eb72170e 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base -PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 rb532 foxg20 +PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 rb532 foxg20 rb411 rb433 WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/package/nand/Makefile b/package/nand/Makefile index f904bc910..dc6292c01 100644 --- a/package/nand/Makefile +++ b/package/nand/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 3 PKG_DESCR:= NAND utility PKG_SECTION:= base -PKG_TARGET_DEPENDS:= rb532 +PKG_TARGET_DEPENDS:= rb532 rb411 rb433 NO_DISTFILES:= 1 -- cgit v1.2.3 From b2ec50ef25ae4a9703da687de598de7a6b18cc8b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 May 2010 18:57:46 +0200 Subject: fix compile issue, when python is found --- package/gdb/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/gdb/Makefile b/package/gdb/Makefile index d98546426..1438ac0b7 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -6,8 +6,8 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc PKG_DESCR:= GNU debugger PKG_SECTION:= comp -PKG_DEPENDS:= libthread-db libncurses libiconv -PKG_BUILDDEP+= ncurses readline libiconv +PKG_DEPENDS:= libthread-db libncurses libiconv libexpat +PKG_BUILDDEP+= ncurses readline libiconv expat PKG_TARGET_DEPENDS:= !foxboard !ag241 PKG_NOPARALLEL:= 1 @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --without-uiout --enable-gdbmi \ --disable-tui --disable-gdbtk --without-x \ --without-included-gettext --disable-sim \ --enable-threads --with-curses --disable-werror \ - --enable-static + --enable-static --without-python XAKE_FLAGS+= LDFLAGS='${TLDFLAGS}' post-install: -- cgit v1.2.3 From 206223d5b9ffb7db97968857cf720b5f36031c13 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 May 2010 18:58:37 +0200 Subject: parallel build is broken on these packages --- package/krb5/Makefile | 2 ++ package/openswan/Makefile | 2 ++ 2 files changed, 4 insertions(+) (limited to 'package') diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 6b553f35f..b9efa2b2c 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP+= ncurses e2fsprogs PKG_URL:= http://web.mit.edu/kerberos PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.7/ +PKG_NOPARALLEL:= 1 + PKG_DESCR_LIB:= MIT kerberos libraries PKG_SECTION_LIB:= libs diff --git a/package/openswan/Makefile b/package/openswan/Makefile index c5588f549..6c0adce62 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -15,6 +15,8 @@ PKG_URL:= http://www.openswan.org PKG_SITES:= http://www.openswan.org/download/ \ ftp://ftp.openswan.org/openswan/ +PKG_NOPARALLEL:= 1 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,OPENSWAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -- cgit v1.2.3 From 8fa64bb300a5063f6f37f9dddfb95588ff3c3cf6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 May 2010 18:58:55 +0200 Subject: update to latest stable upstream --- package/xorg-server/Makefile | 5 ++-- .../patch-hw_xfree86_common_xf86VGAarbiter_c | 17 ----------- .../patches/patch-hw_xfree86_loader_sdksyms_c | 35 +++++++++------------- .../patch-hw_xfree86_os-support_linux_lnx_video_c | 17 ++++++++--- 4 files changed, 30 insertions(+), 44 deletions(-) delete mode 100644 package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c (limited to 'package') diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index e81d4b271..16cbe0359 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xorg-server -PKG_VERSION:= 1.7.5 +PKG_VERSION:= 1.7.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= 866917789c71e7616a016ad256fe9b8f +PKG_MD5SUM:= ba0360b4ec1f6e541b264e45906bf5f2 PKG_DESCR:= Xorg server PKG_SECTION:= x11 PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile \ @@ -42,6 +42,7 @@ CONFIGURE_ARGS+= \ --enable-xorg \ --enable-xv \ --enable-xaa \ + --enable-vgahw \ --disable-aiglx \ --disable-config-hal \ --disable-dpms \ diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c b/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c deleted file mode 100644 index 411d7b2e2..000000000 --- a/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c +++ /dev/null @@ -1,17 +0,0 @@ ---- xorg-server-1.7.1.orig/hw/xfree86/common/xf86VGAarbiter.c 2009-10-09 06:08:28.000000000 +0200 -+++ xorg-server-1.7.1/hw/xfree86/common/xf86VGAarbiter.c 2009-12-10 17:14:01.000000000 +0100 -@@ -38,14 +38,8 @@ - #include "xf86Priv.h" - #include "pciaccess.h" - --#ifdef DEBUG --#error "no, really, you dont want to do this" --#define DPRINT_S(x,y) ErrorF(x ": %i\n",y); --#define DPRINT(x) ErrorF(x "\n"); --#else - #define DPRINT_S(x,y) - #define DPRINT(x) --#endif - - static GCFuncs VGAarbiterGCFuncs = { - VGAarbiterValidateGC, VGAarbiterChangeGC, VGAarbiterCopyGC, diff --git a/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c b/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c index 8ee439b75..771d3a1e6 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c +++ b/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c @@ -1,15 +1,6 @@ ---- xorg-server-1.7.5.orig/hw/xfree86/loader/sdksyms.c 2010-02-16 02:42:49.000000000 +0100 -+++ xorg-server-1.7.5/hw/xfree86/loader/sdksyms.c 2010-04-21 19:50:58.000000000 +0200 -@@ -429,8 +429,6 @@ _X_HIDDEN void *xorg_symbols[] = { - (void *) &AbortDDX, - (void *) &ddxGiveUp, - (void *) &TimeSinceLastInputEvent, -- (void *) &strlcpy, -- (void *) &strlcat, - (void *) &LogInit, - (void *) &LogClose, - (void *) &LogSetParameter, -@@ -634,7 +632,6 @@ _X_HIDDEN void *xorg_symbols[] = { +--- xorg-server-1.7.6.orig/hw/xfree86/loader/sdksyms.c 2010-03-17 01:56:04.000000000 +0100 ++++ xorg-server-1.7.6/hw/xfree86/loader/sdksyms.c 2010-05-14 15:54:56.232212764 +0200 +@@ -634,7 +634,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &NewCurrentScreen, (void *) &PointerConfinedToScreen, (void *) &GetSpritePosition, @@ -17,7 +8,7 @@ (void *) &GEExtensions, (void *) &GERegisterExtension, (void *) &GEInitEvent, -@@ -724,7 +721,6 @@ _X_HIDDEN void *xorg_symbols[] = { +@@ -724,7 +723,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &PickPointer, (void *) &PickKeyboard, (void *) &IsInterferingGrab, @@ -25,7 +16,7 @@ (void *) &ScreenRestructured, (void *) &ffs, (void *) &AddCallback, -@@ -874,8 +870,6 @@ _X_HIDDEN void *xorg_symbols[] = { +@@ -874,8 +872,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &CreateLinearGradientPicture, (void *) &CreateRadialGradientPicture, (void *) &CreateConicalGradientPicture, @@ -34,7 +25,7 @@ (void *) &PictTransform_from_xRenderTransform, (void *) &xRenderTransform_from_PictTransform, (void *) &PictureTransformPoint, -@@ -977,25 +971,6 @@ _X_HIDDEN void *xorg_symbols[] = { +@@ -977,25 +973,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &ShmSegType, (void *) &ShmCompletionCode, (void *) &BadShmSegCode, @@ -60,7 +51,7 @@ (void *) &xf86CreateI2CBusRec, (void *) &xf86DestroyI2CBusRec, (void *) &xf86I2CBusInit, -@@ -1034,19 +1009,9 @@ _X_HIDDEN void *xorg_symbols[] = { +@@ -1034,31 +1011,17 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &noTestExtensions, (void *) &dixScreenOrigins, (void *) &ConnectionInfo, @@ -80,16 +71,18 @@ (void *) &noScreenSaverExtension, (void *) &noMITShmExtension, (void *) &noRRExtension, -@@ -1054,9 +1019,7 @@ _X_HIDDEN void *xorg_symbols[] = { + (void *) &noRenderExtension, (void *) &noResExtension, (void *) &noXFree86DGAExtension, - (void *) &noXFree86DRIExtension, +- (void *) &noXFree86DRIExtension, - (void *) &noXFree86VidModeExtension, (void *) &noXFixesExtension, - (void *) &noPanoramiXExtension, (void *) &noXvExtension, - (void *) &noDRI2Extension, +- (void *) &noDRI2Extension, (void *) &defaultTextFont, + (void *) &defaultCursorFont, + (void *) &MaxClients, @@ -1193,7 +1156,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &ProcRRQueryOutputProperty, (void *) &ProcRRConfigureOutputProperty, @@ -116,7 +109,7 @@ (void *) &xf86fpFlag, (void *) &xf86sFlag, (void *) &xf86bsEnableFlag, -@@ -1935,7 +1893,6 @@ _X_HIDDEN void *xorg_symbols[] = { +@@ -1937,7 +1895,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &ProcGrabButton, (void *) &ProcUngrabButton, (void *) &ProcRecolorCursor, @@ -124,7 +117,7 @@ (void *) &SetDefaultFont, (void *) &QueueFontWakeup, (void *) &RemoveFontWakeup, -@@ -2185,15 +2142,6 @@ _X_HIDDEN void *xorg_symbols[] = { +@@ -2187,15 +2144,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &SProcUngrabButton, (void *) &SProcUngrabKey, (void *) &SProcWarpPointer, diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c index 8c93131b1..d0c187169 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c +++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c @@ -1,6 +1,15 @@ ---- xorg-server-1.7.5.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-02-16 01:24:23.000000000 +0100 -+++ xorg-server-1.7.5/hw/xfree86/os-support/linux/lnx_video.c 2010-03-08 21:31:20.000000000 +0100 -@@ -497,7 +497,7 @@ volatile unsigned char *ioBase = NULL; +--- xorg-server-1.7.6.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-03-12 05:38:22.000000000 +0100 ++++ xorg-server-1.7.6/hw/xfree86/os-support/linux/lnx_video.c 2010-05-14 19:06:06.873473002 +0200 +@@ -64,6 +64,8 @@ static Bool ExtendedEnabled = FALSE; + !defined(__mips__) && \ + !defined(__arm__) + ++#include "compiler.h" ++ + /* + * Due to conflicts with "compiler.h", don't rely on to declare + * these. +@@ -497,7 +499,7 @@ volatile unsigned char *ioBase = NULL; Bool xf86EnableIO(void) { @@ -9,7 +18,7 @@ int fd; unsigned int ioBase_phys; #endif -@@ -524,6 +524,20 @@ xf86EnableIO(void) +@@ -524,6 +526,20 @@ xf86EnableIO(void) #endif } close(fd); -- cgit v1.2.3 From 6c9c74f0b91133a348fb6480412911046dec299f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 May 2010 21:12:22 +0200 Subject: do some cleanup, update ibm x40 to 2.6.34 --- package/adkinstall/Makefile | 2 +- package/cfgfs/Makefile | 2 +- package/nand/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile index 944c073fb..e758b1f2f 100644 --- a/package/adkinstall/Makefile +++ b/package/adkinstall/Makefile @@ -10,7 +10,7 @@ PKG_DESCR:= installer for cf, mmc, sd or mtd devices PKG_SECTION:= base PKG_DEPENDS:= parted sfdisk e2fsprogs -PKG_TARGET_DEPENDS:= alix wrap rb532 foxg20 rb411 rb433 +PKG_TARGET_DEPENDS:= alix wrap routerboard foxg20 WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 4eb72170e..b7ca8a67c 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base -PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 rb532 foxg20 rb411 rb433 +PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 foxg20 routerboard WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/package/nand/Makefile b/package/nand/Makefile index dc6292c01..0cd95f45b 100644 --- a/package/nand/Makefile +++ b/package/nand/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 3 PKG_DESCR:= NAND utility PKG_SECTION:= base -PKG_TARGET_DEPENDS:= rb532 rb411 rb433 +PKG_TARGET_DEPENDS:= routerboard NO_DISTFILES:= 1 -- cgit v1.2.3 From 5a65511ac3d0c687d1f2c012087b55d2950d211c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 25 May 2010 17:16:38 +0200 Subject: add some missing files --- package/adkinstall/src/adkinstall.rb4xx | 36 +++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/adkinstall/src/adkinstall.rb4xx (limited to 'package') diff --git a/package/adkinstall/src/adkinstall.rb4xx b/package/adkinstall/src/adkinstall.rb4xx new file mode 100644 index 000000000..f96cc7f05 --- /dev/null +++ b/package/adkinstall/src/adkinstall.rb4xx @@ -0,0 +1,36 @@ +#!/bin/sh +# installs a rootfs tar archive from OpenADK onto +# a NAND device +# special script for routerboard rb4xx + +if [ -z $1 ];then + printf "Please give your root tar archive as parameter\n" + exit 1 +fi + +printf "Preparing mountpoints\n" +mount -t yaffs2 /dev/mtdblock2 /mnt +rm -rf /mnt/* >/dev/null 2>&1 +mkdir /mnt/boot +mount -t yaffs2 /dev/mtdblock1 /mnt/boot + +printf "Extracting install archive\n" +tar -C /mnt -xzpf $1 +if [ $? -ne 0 ];then + printf "Extracting of install archive failed" + exit 1 +fi + +chmod 1777 /mnt/tmp +chmod 4755 /mnt/bin/busybox + +sync +umount /mnt/boot +umount /mnt +if [ $? -ne 0 ];then + printf "Unmounting filesystem failed" + exit 1 +else + printf "Successfully installed.\n" + exit 0 +fi -- cgit v1.2.3 From 23eff1d5d3d4f22fc3d2fe9de026e3df3edf426d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 25 May 2010 17:48:45 +0200 Subject: fix MesaLib cross-compile --- package/MesaLib/Makefile | 19 ++++++++++++++++++- package/MesaLib/patches/patch-src_glsl_Makefile | 11 +++++++++++ .../MesaLib/patches/patch-src_glsl_Makefile_template | 11 ----------- package/MesaLib/patches/patch-src_glsl_apps_Makefile | 15 --------------- package/firefox/Makefile | 1 + package/libXdamage/Makefile | 4 ++-- package/libXfixes/Makefile | 4 ++-- 7 files changed, 34 insertions(+), 31 deletions(-) create mode 100644 package/MesaLib/patches/patch-src_glsl_Makefile delete mode 100644 package/MesaLib/patches/patch-src_glsl_Makefile_template delete mode 100644 package/MesaLib/patches/patch-src_glsl_apps_Makefile (limited to 'package') diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 9d673613f..d5ce04b77 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= MESA library PKG_SECTION:= libs PKG_DEPENDS:= libxdamage libxfixes libdrm PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm libdrm -PKG_BUILDDEP+= dri2proto glproto +PKG_BUILDDEP+= dri2proto glproto expat PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.1/ @@ -25,10 +25,27 @@ $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D CONFIGURE_ARGS+= --disable-static \ --disable-gallium \ + --disable-glw \ + --with-driver=dri \ --without-demos XAKE_FLAGS+= APP_CC=${HOSTCC} HOST_CC=${HOSTCC} +pre-configure: + (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ + ./configure \ + --disable-static \ + --disable-glw \ + --disable-gallium \ + --with-driver=xlib \ + --without-demos \ + ); + ${MAKE} -C ${WRKBUILD}/src/glsl + ${MAKE} -C ${WRKBUILD}/src/glsl/apps + cp ${WRKBUILD}/src/glsl/apps/compile \ + ${STAGING_TOOLS}/bin + ${MAKE} -C ${WRKBUILD}/src/glsl clean + post-install: $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib $(INSTALL_BIN) $(WRKINST)/usr/lib/libGL*.so* \ diff --git a/package/MesaLib/patches/patch-src_glsl_Makefile b/package/MesaLib/patches/patch-src_glsl_Makefile new file mode 100644 index 000000000..baa023db4 --- /dev/null +++ b/package/MesaLib/patches/patch-src_glsl_Makefile @@ -0,0 +1,11 @@ +--- Mesa-7.8.1.orig/src/glsl/Makefile 2010-04-05 01:46:26.000000000 +0200 ++++ Mesa-7.8.1/src/glsl/Makefile 2010-05-21 17:17:54.621613561 +0200 +@@ -4,7 +4,7 @@ TOP = ../.. + + include $(TOP)/configs/current + +-SUBDIRS = pp cl apps ++SUBDIRS = pp cl + + default install clean: + @for dir in $(SUBDIRS) ; do \ diff --git a/package/MesaLib/patches/patch-src_glsl_Makefile_template b/package/MesaLib/patches/patch-src_glsl_Makefile_template deleted file mode 100644 index bcb3256d6..000000000 --- a/package/MesaLib/patches/patch-src_glsl_Makefile_template +++ /dev/null @@ -1,11 +0,0 @@ ---- Mesa-7.8.1.orig/src/glsl/Makefile.template 2010-04-05 01:46:26.000000000 +0200 -+++ Mesa-7.8.1/src/glsl/Makefile.template 2010-04-19 21:18:45.000000000 +0200 -@@ -44,7 +44,7 @@ install: - ##### RULES ##### - - .c.o: -- $(CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@ -+ $(HOST_CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@ - - -include depend - diff --git a/package/MesaLib/patches/patch-src_glsl_apps_Makefile b/package/MesaLib/patches/patch-src_glsl_apps_Makefile deleted file mode 100644 index 175965dc5..000000000 --- a/package/MesaLib/patches/patch-src_glsl_apps_Makefile +++ /dev/null @@ -1,15 +0,0 @@ ---- Mesa-7.8.1.orig/src/glsl/apps/Makefile 2010-04-05 01:46:26.000000000 +0200 -+++ Mesa-7.8.1/src/glsl/apps/Makefile 2010-04-19 21:20:55.000000000 +0200 -@@ -26,10 +26,10 @@ INCLUDES = -I. - .SUFFIXES: .c - - .c: -- $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@ -+ $(APP_CC) $(HOSTCFLAGS) $< $(LIBS) -o $@ - - .c.o: -- $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ -+ $(APP_CC) -c $(HOSTCFLAGS) $(DEFINES) $< -o $@ - - - ##### TARGETS ##### diff --git a/package/firefox/Makefile b/package/firefox/Makefile index b8d667241..0009c48e2 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -11,6 +11,7 @@ PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11 PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib gtk+ libnotify libidl PKG_DEPENDS+= nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx +PKG_DEPENDS+= libxdamage libxfixes PKG_BUILDDEP+= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 libXt PKG_BUILDDEP+= nspr nss jpeg PKG_URL:= http://www.mozilla.org/ diff --git a/package/libXdamage/Makefile b/package/libXdamage/Makefile index 8e783c4fc..781481185 100644 --- a/package/libXdamage/Makefile +++ b/package/libXdamage/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXdamage PKG_VERSION:= 1.1.2 PKG_RELEASE:= 1 PKG_MD5SUM:= f8f19f747c8445213d5409ae8b8b2f0a -PKG_DESCR:= add short description +PKG_DESCR:= X Window System client interface to the DAMAGE extension to the X protocol PKG_SECTION:= libs PKG_BUILDDEP+= libXfixes damageproto PKG_URL:= add project url @@ -19,7 +19,7 @@ $(eval $(call PKG_template,LIBXDAMAGE,libxdamage,$(PKG_VERSION)-${PKG_RELEASE},$ post-install: $(INSTALL_DIR) $(IDIR_LIBXDAMAGE)/usr/lib - $(INSTALL_BIN) $(WRKINST)/usr/lib/libXdamage* \ + $(INSTALL_BIN) $(WRKINST)/usr/lib/libXdamage*.so* \ $(IDIR_LIBXDAMAGE)/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile index d8f05f261..d6cc76bfb 100644 --- a/package/libXfixes/Makefile +++ b/package/libXfixes/Makefile @@ -7,10 +7,10 @@ PKG_NAME:= libXfixes PKG_VERSION:= 4.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 86eb4b916cd5948c0e20d279107b3331 -PKG_DESCR:= add short description +PKG_DESCR:= X Fixes Library PKG_SECTION:= libs PKG_BUILDDEP+= fixesproto -PKG_URL:= add project url +PKG_URL:= http://xorg.freedesktop.org PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/ include $(TOPDIR)/mk/package.mk -- cgit v1.2.3 From 9376189094b499d8c0f110014ba7094464008f72 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 28 May 2010 14:52:06 +0200 Subject: fix compile on Cygwin Hostsystem --- package/bash/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package') diff --git a/package/bash/Makefile b/package/bash/Makefile index b06ee4991..c0b55681e 100644 --- a/package/bash/Makefile +++ b/package/bash/Makefile @@ -16,6 +16,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BASH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ENV+= bash_cv_getenv_redef=no XAKE_FLAGS+= LIBS_FOR_BUILD='' post-install: -- cgit v1.2.3 From dd4bea69c025d73c04d79830165b32db36133417 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 28 May 2010 14:52:21 +0200 Subject: disable for Cygwin Host --- package/binutils/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'package') diff --git a/package/binutils/Makefile b/package/binutils/Makefile index 9d1df7793..3d54ff6ea 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/toolchain/binutils/Makefile.inc PKG_DESCR:= binary utilities (nm, objdump, ar, as, ..) PKG_SECTION:= comp +PKG_HOST_DEPENDS:= !cygwin include ${TOPDIR}/mk/package.mk @@ -16,10 +17,6 @@ CONFIGURE_ARGS+= --disable-werror \ --host=$(REAL_GNU_TARGET_NAME) \ --target=$(REAL_GNU_TARGET_NAME) -post-patch: - ${PREVENT_PATCH} ${PATCH} ${WRKDIST} \ - ${TOPDIR}/toolchain/binutils/patches \*.patch - post-install: ${INSTALL_DIR} ${IDIR_BINUTILS}/usr/lib $(CP) ${WRKINST}/usr/lib/*.so ${IDIR_BINUTILS}/usr/lib -- cgit v1.2.3 From 3a140cf9b77a3b7b18f8684352ef00a6d8752a17 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 28 May 2010 19:30:13 +0200 Subject: fix build dependency --- package/ccid/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package') diff --git a/package/ccid/Makefile b/package/ccid/Makefile index 2e63a888c..98d36a3cd 100644 --- a/package/ccid/Makefile +++ b/package/ccid/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 7fcdbacacd955659286f988fa9b6e0be PKG_DESCR:= a generic USB CCID and ICCD driver PKG_SECTION:= security +PKG_BUILDDEP+= pcsc-lite PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html PKG_SITES:= https://alioth.debian.org/frs/download.php/3281/ -- cgit v1.2.3 From 92dd4fee15cb7c33868c7d7213f82136955397b1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 29 May 2010 14:29:22 +0200 Subject: upgrade all targets to Linux 2.6.34 --- package/MesaLib/patches/patch-src_glsl_apps_Makefile | 15 +++++++++++++++ package/libXxf86vm/Makefile | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 package/MesaLib/patches/patch-src_glsl_apps_Makefile (limited to 'package') diff --git a/package/MesaLib/patches/patch-src_glsl_apps_Makefile b/package/MesaLib/patches/patch-src_glsl_apps_Makefile new file mode 100644 index 000000000..76d23d7bf --- /dev/null +++ b/package/MesaLib/patches/patch-src_glsl_apps_Makefile @@ -0,0 +1,15 @@ +--- Mesa-7.8.1.orig/src/glsl/apps/Makefile 2010-04-05 01:46:26.000000000 +0200 ++++ Mesa-7.8.1/src/glsl/apps/Makefile 2010-05-25 17:38:03.594714854 +0200 +@@ -26,10 +26,10 @@ INCLUDES = -I. + .SUFFIXES: .c + + .c: +- $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@ ++ $(APP_CC) $(HOSTCFLAGS) $< $(LIBS) -o $@ + + .c.o: +- $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ ++ $(APP_CC) -c $(HOSTCFLAGS) $(DEFINES) $< -o $@ + + + ##### TARGETS ##### diff --git a/package/libXxf86vm/Makefile b/package/libXxf86vm/Makefile index 778b74f0b..4d8d57f12 100644 --- a/package/libXxf86vm/Makefile +++ b/package/libXxf86vm/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 52b49483eccbdd1566b8c560fe7f76e8 PKG_DESCR:= add short description PKG_SECTION:= libs -PKG_BUILDDEP+= xf86vidmodeproto +PKG_BUILDDEP+= xf86vidmodeproto libXext PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/ include $(TOPDIR)/mk/package.mk -- cgit v1.2.3 From 1a1c38ece81ef998be92218ade235bc7b44d9643 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 29 May 2010 18:50:47 +0200 Subject: remove swconfig, enable USB and NLS for alix boards --- package/Config.in | 1 - package/swconfig/Makefile | 32 --- package/swconfig/src/Makefile | 12 - package/swconfig/src/cli.c | 255 ------------------ package/swconfig/src/swlib.c | 614 ------------------------------------------ package/swconfig/src/swlib.h | 213 --------------- 6 files changed, 1127 deletions(-) delete mode 100644 package/swconfig/Makefile delete mode 100644 package/swconfig/src/Makefile delete mode 100644 package/swconfig/src/cli.c delete mode 100644 package/swconfig/src/swlib.c delete mode 100644 package/swconfig/src/swlib.h (limited to 'package') diff --git a/package/Config.in b/package/Config.in index 265e222fd..80717c15b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -587,7 +587,6 @@ source "package/sispmctl/Config.in" source "package/stress/Config.in" source "package/sysfsutils/Config.in" source "package/sysstat/Config.in" -source "package/swconfig/Config.in" source "package/udev/Config.in" source "package/watchdog/Config.in" endmenu diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile deleted file mode 100644 index 8d7573c36..000000000 --- a/package/swconfig/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= swconfig -PKG_VERSION:= 1.0 -PKG_RELEASE:= 1 -PKG_DESCR:= switch configuration utility -PKG_SECTION:= misc -PKG_DEPENDS:= libnl -PKG_BUILDDEP+= libnl - -PKG_TARGET_CONFIG:= rb433 - -NO_DISTFILES:= 1 - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,SWCONFIG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= manual -INSTALL_STYLE:= manual - -XAKE_FLAGS:= LIBS="-lnl -lm" CFLAGS="$(TARGET_CFLAGS) \ - -I$(LINUX_DIR)/include" - -do-install: - ${INSTALL_DIR} ${IDIR_SWCONFIG}/sbin - ${INSTALL_BIN} ${WRKBUILD}/swconfig ${IDIR_SWCONFIG}/sbin/ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/swconfig/src/Makefile b/package/swconfig/src/Makefile deleted file mode 100644 index 64816af54..000000000 --- a/package/swconfig/src/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -ifndef CFLAGS -CFLAGS = -O2 -g -I ../src -endif -LIBS=-lnl - -all: swconfig - -%.o: %.c - $(CC) $(CFLAGS) -c -o $@ $^ - -swconfig: cli.o swlib.o - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) diff --git a/package/swconfig/src/cli.c b/package/swconfig/src/cli.c deleted file mode 100644 index c6035e585..000000000 --- a/package/swconfig/src/cli.c +++ /dev/null @@ -1,255 +0,0 @@ -/* - * swconfig.c: Switch configuration utility - * - * Copyright (C) 2008 Felix Fietkau - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundatio. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include "swlib.h" - -#define GET 1 -#define SET 2 - -void print_attrs(struct switch_attr *attr) -{ - int i = 0; - while (attr) { - const char *type; - switch(attr->type) { - case SWITCH_TYPE_INT: - type = "int"; - break; - case SWITCH_TYPE_STRING: - type = "string"; - break; - case SWITCH_TYPE_PORTS: - type = "ports"; - break; - case SWITCH_TYPE_NOVAL: - type = "none"; - break; - default: - type = "unknown"; - break; - } - printf("\tAttribute %d (%s): %s (%s)\n", ++i, type, attr->name, attr->description); - attr = attr->next; - } -} - -void list_attributes(struct switch_dev *dev) -{ - printf("Switch %d: %s(%s), ports: %d, vlans: %d\n", dev->id, dev->dev_name, dev->name, dev->ports, dev->vlans); - printf(" --switch\n"); - print_attrs(dev->ops); - printf(" --vlan\n"); - print_attrs(dev->vlan_ops); - printf(" --port\n"); - print_attrs(dev->port_ops); -} - -void print_usage(void) -{ - printf("swconfig dev [port |vlan ] (help|set |get )\n"); - exit(0); -} - -int main(int argc, char **argv) -{ - int retval = 0; - struct switch_dev *dev; - struct switch_attr *a; - struct switch_val val; - int err; - int i; - - struct switch_port *ports; - - int cmd = 0; - char *cdev = NULL; - int cport = -1; - int cvlan = -1; - char *ckey = NULL; - char *cvalue = NULL; - int chelp = 0; - - if(argc < 4) - print_usage(); - - if(strcmp(argv[1], "dev")) - print_usage(); - - cdev = argv[2]; - - for(i = 3; i < argc; i++) - { - int p; - if(!strcmp(argv[i], "help")) - { - chelp = 1; - continue; - } - if(i + 1 >= argc) - print_usage(); - p = atoi(argv[i + 1]); - if(!strcmp(argv[i], "port")) - { - cport = p; - } else if(!strcmp(argv[i], "vlan")) - { - cvlan = p; - } else if(!strcmp(argv[i], "set")) - { - if(argc <= i + 1) - print_usage(); - cmd = SET; - ckey = argv[i + 1]; - if (argc > i + 2) - cvalue = argv[i + 2]; - else - cvalue = NULL; - i++; - } else if(!strcmp(argv[i], "get")) - { - cmd = GET; - ckey = argv[i + 1]; - } else{ - print_usage(); - } - i++; - } - - if(cport > -1 && cvlan > -1) - print_usage(); - - dev = swlib_connect(cdev); - if (!dev) { - fprintf(stderr, "Failed to connect to the switch\n"); - return 1; - } - - ports = malloc(sizeof(struct switch_port) * dev->ports); - memset(ports, 0, sizeof(struct switch_port) * dev->ports); - swlib_scan(dev); - - if(chelp) - { - list_attributes(dev); - goto out; - } - - if(cport > -1) - a = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_PORT, ckey); - else if(cvlan > -1) - a = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_VLAN, ckey); - else - a = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_GLOBAL, ckey); - - if(!a) - { - fprintf(stderr, "Unknown attribute \"%s\"\n", ckey); - goto out; - } - - switch(cmd) - { - case SET: - if ((a->type != SWITCH_TYPE_NOVAL) && - (cvalue == NULL)) - print_usage(); - - switch(a->type) { - case SWITCH_TYPE_INT: - val.value.i = atoi(cvalue); - break; - case SWITCH_TYPE_STRING: - val.value.s = cvalue; - break; - case SWITCH_TYPE_PORTS: - val.len = 0; - while(cvalue && *cvalue) - { - ports[val.len].flags = 0; - ports[val.len].id = strtol(cvalue, &cvalue, 10); - while(*cvalue && !isspace(*cvalue)) { - if (*cvalue == 't') - ports[val.len].flags |= SWLIB_PORT_FLAG_TAGGED; - cvalue++; - } - if (*cvalue) - cvalue++; - val.len++; - } - val.value.ports = ports; - break; - default: - break; - } - if(cvlan > -1) - val.port_vlan = cvlan; - if(cport > -1) - val.port_vlan = cport; - if(swlib_set_attr(dev, a, &val) < 0) - { - fprintf(stderr, "failed\n"); - retval = -1; - goto out; - } - break; - case GET: - if(cvlan > -1) - val.port_vlan = cvlan; - if(cport > -1) - val.port_vlan = cport; - if(swlib_get_attr(dev, a, &val) < 0) - { - fprintf(stderr, "failed\n"); - retval = -1; - goto out; - } - switch(a->type) { - case SWITCH_TYPE_INT: - printf("%d\n", val.value.i); - break; - case SWITCH_TYPE_STRING: - printf("%s\n", val.value.s); - break; - case SWITCH_TYPE_PORTS: - for(i = 0; i < val.len; i++) - printf("%d ", val.value.ports[i]); - printf("\n"); - break; - } - } - -out: - swlib_free_all(dev); - free(ports); - - return 0; -} diff --git a/package/swconfig/src/swlib.c b/package/swconfig/src/swlib.c deleted file mode 100644 index 3fde81641..000000000 --- a/package/swconfig/src/swlib.c +++ /dev/null @@ -1,614 +0,0 @@ -/* - * swlib.c: Switch configuration API (user space part) - * - * Copyright (C) 2008 Felix Fietkau - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "swlib.h" - -//#define DEBUG 1 -#ifdef DEBUG -#define DPRINTF(fmt, ...) fprintf(stderr, "%s(%d): " fmt, __func__, __LINE__, ##__VA_ARGS__) -#else -#define DPRINTF(fmt, ...) do {} while (0) -#endif - -static struct nl_handle *handle; -static struct nl_cache *cache; -static struct genl_family *family; -static struct nlattr *tb[SWITCH_ATTR_MAX]; -static int refcount = 0; - -static struct nla_policy port_policy[] = { - [SWITCH_PORT_ID] = { .type = NLA_U32 }, - [SWITCH_PORT_FLAG_TAGGED] = { .type = NLA_FLAG }, -}; - -static inline void * -swlib_alloc(size_t size) -{ - void *ptr; - - ptr = malloc(size); - if (!ptr) - goto done; - memset(ptr, 0, size); - -done: - return ptr; -} - -static int -wait_handler(struct nl_msg *msg, void *arg) -{ - int *finished = arg; - - *finished = 1; - return NL_STOP; -} - -/* helper function for performing netlink requests */ -static int -swlib_call(int cmd, int (*call)(struct nl_msg *, void *), - int (*data)(struct nl_msg *, void *), void *arg) -{ - struct nl_msg *msg; - struct nl_cb *cb = NULL; - int finished; - int flags = 0; - int err; - - msg = nlmsg_alloc(); - if (!msg) { - fprintf(stderr, "Out of memory!\n"); - exit(1); - } - - if (!data) - flags |= NLM_F_DUMP; - - genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, genl_family_get_id(family), 0, flags, cmd, 0); - if (data) { - if (data(msg, arg) < 0) - goto nla_put_failure; - } - - cb = nl_cb_alloc(NL_CB_CUSTOM); - if (!cb) { - fprintf(stderr, "nl_cb_alloc failed.\n"); - exit(1); - } - - err = nl_send_auto_complete(handle, msg); - if (err < 0) { - fprintf(stderr, "nl_send_auto_complete failed: %d\n", err); - goto out; - } - - finished = 0; - - if (call) - nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, call, arg); - - if (data) - nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, wait_handler, &finished); - else - nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, wait_handler, &finished); - - err = nl_recvmsgs(handle, cb); - if (err < 0) { - goto out; - } - - if (!finished) - err = nl_wait_for_ack(handle); - -out: - if (cb) - nl_cb_put(cb); -nla_put_failure: - nlmsg_free(msg); - return err; -} - -static int -send_attr(struct nl_msg *msg, void *arg) -{ - struct switch_val *val = arg; - struct switch_attr *attr = val->attr; - - NLA_PUT_U32(msg, SWITCH_ATTR_ID, attr->dev->id); - NLA_PUT_U32(msg, SWITCH_ATTR_OP_ID, attr->id); - switch(attr->atype) { - case SWLIB_ATTR_GROUP_PORT: - NLA_PUT_U32(msg, SWITCH_ATTR_OP_PORT, val->port_vlan); - break; - case SWLIB_ATTR_GROUP_VLAN: - NLA_PUT_U32(msg, SWITCH_ATTR_OP_VLAN, val->port_vlan); - break; - default: - break; - } - - return 0; - -nla_put_failure: - return -1; -} - -static int -store_port_val(struct nl_msg *msg, struct nlattr *nla, struct switch_val *val) -{ - struct nlattr *p; - int ports = val->attr->dev->ports; - int err = 0; - int remaining; - - if (!val->value.ports) - val->value.ports = malloc(sizeof(struct switch_port) * ports); - - nla_for_each_nested(p, nla, remaining) { - struct nlattr *tb[SWITCH_PORT_ATTR_MAX+1]; - struct switch_port *port; - - if (val->len >= ports) - break; - - err = nla_parse_nested(tb, SWITCH_PORT_ATTR_MAX, p, port_policy); - if (err < 0) - goto out; - - if (!tb[SWITCH_PORT_ID]) - continue; - - port = &val->value.ports[val->len]; - port->id = nla_get_u32(tb[SWITCH_PORT_ID]); - port->flags = 0; - if (tb[SWITCH_PORT_FLAG_TAGGED]) - port->flags |= SWLIB_PORT_FLAG_TAGGED; - - val->len++; - } - -out: - return err; -} - -static int -store_val(struct nl_msg *msg, void *arg) -{ - struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); - struct switch_val *val = arg; - struct switch_attr *attr = val->attr; - - if (!val) - goto error; - - if (nla_parse(tb, SWITCH_ATTR_MAX - 1, genlmsg_attrdata(gnlh, 0), - genlmsg_attrlen(gnlh, 0), NULL) < 0) { - goto error; - } - - if (tb[SWITCH_ATTR_OP_VALUE_INT]) - val->value.i = nla_get_u32(tb[SWITCH_ATTR_OP_VALUE_INT]); - else if (tb[SWITCH_ATTR_OP_VALUE_STR]) - val->value.s = strdup(nla_get_string(tb[SWITCH_ATTR_OP_VALUE_STR])); - else if (tb[SWITCH_ATTR_OP_VALUE_PORTS]) - val->err = store_port_val(msg, tb[SWITCH_ATTR_OP_VALUE_PORTS], val); - - val->err = 0; - return 0; - -error: - return NL_SKIP; -} - -int -swlib_get_attr(struct switch_dev *dev, struct switch_attr *attr, struct switch_val *val) -{ - int cmd; - int err; - - switch(attr->atype) { - case SWLIB_ATTR_GROUP_GLOBAL: - cmd = SWITCH_CMD_GET_GLOBAL; - break; - case SWLIB_ATTR_GROUP_PORT: - cmd = SWITCH_CMD_GET_PORT; - break; - case SWLIB_ATTR_GROUP_VLAN: - cmd = SWITCH_CMD_GET_VLAN; - break; - default: - return -EINVAL; - } - - memset(&val->value, 0, sizeof(val->value)); - val->len = 0; - val->attr = attr; - val->err = -EINVAL; - err = swlib_call(cmd, store_val, send_attr, val); - if (!err) - err = val->err; - - return err; -} - -static int -send_attr_ports(struct nl_msg *msg, struct switch_val *val) -{ - struct nlattr *n; - int i; - - /* TODO implement multipart? */ - if (val->len == 0) - goto done; - n = nla_nest_start(msg, SWITCH_ATTR_OP_VALUE_PORTS); - if (!n) - goto nla_put_failure; - for (i = 0; i < val->len; i++) { - struct switch_port *port = &val->value.ports[i]; - struct nlattr *np; - - np = nla_nest_start(msg, SWITCH_ATTR_PORT); - if (!np) - goto nla_put_failure; - - NLA_PUT_U32(msg, SWITCH_PORT_ID, port->id); - if (port->flags & SWLIB_PORT_FLAG_TAGGED) - NLA_PUT_FLAG(msg, SWITCH_PORT_FLAG_TAGGED); - - nla_nest_end(msg, np); - } - nla_nest_end(msg, n); -done: - return 0; - -nla_put_failure: - return -1; -} - -static int -send_attr_val(struct nl_msg *msg, void *arg) -{ - struct switch_val *val = arg; - struct switch_attr *attr = val->attr; - - if (send_attr(msg, arg)) - goto nla_put_failure; - - switch(attr->type) { - case SWITCH_TYPE_NOVAL: - break; - case SWITCH_TYPE_INT: - NLA_PUT_U32(msg, SWITCH_ATTR_OP_VALUE_INT, val->value.i); - break; - case SWITCH_TYPE_STRING: - if (!val->value.s) - goto nla_put_failure; - NLA_PUT_STRING(msg, SWITCH_ATTR_OP_VALUE_STR, val->value.s); - break; - case SWITCH_TYPE_PORTS: - if (send_attr_ports(msg, val) < 0) - goto nla_put_failure; - break; - default: - goto nla_put_failure; - } - return 0; - -nla_put_failure: - return -1; -} - -int -swlib_set_attr(struct switch_dev *dev, struct switch_attr *attr, struct switch_val *val) -{ - int cmd; - - switch(attr->atype) { - case SWLIB_ATTR_GROUP_GLOBAL: - cmd = SWITCH_CMD_SET_GLOBAL; - break; - case SWLIB_ATTR_GROUP_PORT: - cmd = SWITCH_CMD_SET_PORT; - break; - case SWLIB_ATTR_GROUP_VLAN: - cmd = SWITCH_CMD_SET_VLAN; - break; - default: - return -EINVAL; - } - - val->attr = attr; - return swlib_call(cmd, NULL, send_attr_val, val); -} - - -struct attrlist_arg { - int id; - int atype; - struct switch_dev *dev; - struct switch_attr *prev; - struct switch_attr **head; -}; - -static int -add_id(struct nl_msg *msg, void *arg) -{ - struct attrlist_arg *l = arg; - - NLA_PUT_U32(msg, SWITCH_ATTR_ID, l->id); - - return 0; -nla_put_failure: - return -1; -} - -static int -add_attr(struct nl_msg *msg, void *ptr) -{ - struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); - struct attrlist_arg *arg = ptr; - struct switch_attr *new; - - if (nla_parse(tb, SWITCH_ATTR_MAX - 1, genlmsg_attrdata(gnlh, 0), - genlmsg_attrlen(gnlh, 0), NULL) < 0) - goto done; - - new = swlib_alloc(sizeof(struct switch_attr)); - if (!new) - goto done; - - new->dev = arg->dev; - new->atype = arg->atype; - if (arg->prev) { - arg->prev->next = new; - } else { - arg->prev = *arg->head; - } - *arg->head = new; - arg->head = &new->next; - - if (tb[SWITCH_ATTR_OP_ID]) - new->id = nla_get_u32(tb[SWITCH_ATTR_OP_ID]); - if (tb[SWITCH_ATTR_OP_TYPE]) - new->type = nla_get_u32(tb[SWITCH_ATTR_OP_TYPE]); - if (tb[SWITCH_ATTR_OP_NAME]) - new->name = strdup(nla_get_string(tb[SWITCH_ATTR_OP_NAME])); - if (tb[SWITCH_ATTR_OP_DESCRIPTION]) - new->description = strdup(nla_get_string(tb[SWITCH_ATTR_OP_DESCRIPTION])); - -done: - return NL_SKIP; -} - -int -swlib_scan(struct switch_dev *dev) -{ - struct attrlist_arg arg; - - if (dev->ops || dev->port_ops || dev->vlan_ops) - return 0; - - arg.atype = SWLIB_ATTR_GROUP_GLOBAL; - arg.dev = dev; - arg.id = dev->id; - arg.prev = NULL; - arg.head = &dev->ops; - swlib_call(SWITCH_CMD_LIST_GLOBAL, add_attr, add_id, &arg); - - arg.atype = SWLIB_ATTR_GROUP_PORT; - arg.prev = NULL; - arg.head = &dev->port_ops; - swlib_call(SWITCH_CMD_LIST_PORT, add_attr, add_id, &arg); - - arg.atype = SWLIB_ATTR_GROUP_VLAN; - arg.prev = NULL; - arg.head = &dev->vlan_ops; - swlib_call(SWITCH_CMD_LIST_VLAN, add_attr, add_id, &arg); - - return 0; -} - -struct switch_attr *swlib_lookup_attr(struct switch_dev *dev, - enum swlib_attr_group atype, const char *name) -{ - struct switch_attr *head; - - if (!name || !dev) - return NULL; - - switch(atype) { - case SWLIB_ATTR_GROUP_GLOBAL: - head = dev->ops; - break; - case SWLIB_ATTR_GROUP_PORT: - head = dev->port_ops; - break; - case SWLIB_ATTR_GROUP_VLAN: - head = dev->vlan_ops; - break; - } - while(head) { - if (!strcmp(name, head->name)) - return head; - head = head->next; - } - - return NULL; -} - -static void -swlib_priv_free(void) -{ - if (cache) - nl_cache_free(cache); - if (handle) - nl_handle_destroy(handle); - handle = NULL; - cache = NULL; -} - -static int -swlib_priv_init(void) -{ - handle = nl_handle_alloc(); - if (!handle) { - DPRINTF("Failed to create handle\n"); - goto err; - } - - if (genl_connect(handle)) { - DPRINTF("Failed to connect to generic netlink\n"); - goto err; - } - - cache = genl_ctrl_alloc_cache(handle); - if (!cache) { - DPRINTF("Failed to allocate netlink cache\n"); - goto err; - } - - family = genl_ctrl_search_by_name(cache, "switch"); - if (!family) { - DPRINTF("Switch API not present\n"); - goto err; - } - return 0; - -err: - swlib_priv_free(); - return -EINVAL; -} - -struct swlib_scan_arg { - const char *name; - struct switch_dev *head; - struct switch_dev *ptr; -}; - -static int -add_switch(struct nl_msg *msg, void *arg) -{ - struct swlib_scan_arg *sa = arg; - struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); - struct switch_dev *dev; - const char *name; - - if (nla_parse(tb, SWITCH_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0) - goto done; - - if (!tb[SWITCH_ATTR_DEV_NAME]) - goto done; - - name = nla_get_string(tb[SWITCH_ATTR_DEV_NAME]); - if (sa->name && (strcmp(name, sa->name) != 0)) - goto done; - - dev = swlib_alloc(sizeof(struct switch_dev)); - if (!dev) - goto done; - - dev->dev_name = strdup(name); - if (tb[SWITCH_ATTR_ID]) - dev->id = nla_get_u32(tb[SWITCH_ATTR_ID]); - if (tb[SWITCH_ATTR_NAME]) - dev->name = strdup(nla_get_string(tb[SWITCH_ATTR_DEV_NAME])); - if (tb[SWITCH_ATTR_PORTS]) - dev->ports = nla_get_u32(tb[SWITCH_ATTR_PORTS]); - if (tb[SWITCH_ATTR_VLANS]) - dev->vlans = nla_get_u32(tb[SWITCH_ATTR_VLANS]); - - if (!sa->head) { - sa->head = dev; - sa->ptr = dev; - } else { - sa->ptr->next = dev; - sa->ptr = dev; - } - - refcount++; -done: - return NL_SKIP; -} - - -struct switch_dev * -swlib_connect(const char *name) -{ - struct swlib_scan_arg arg; - int err; - - if (!refcount) { - if (swlib_priv_init() < 0) - return NULL; - }; - - arg.head = NULL; - arg.ptr = NULL; - arg.name = name; - swlib_call(SWITCH_CMD_GET_SWITCH, add_switch, NULL, &arg); - - if (!refcount) - swlib_priv_free(); - - return arg.head; -} - -static void -swlib_free_attributes(struct switch_attr **head) -{ - struct switch_attr *a = *head; - struct switch_attr *next; - - while (a) { - next = a->next; - free(a); - a = next; - } - *head = NULL; -} - -void -swlib_free(struct switch_dev *dev) -{ - swlib_free_attributes(&dev->ops); - swlib_free_attributes(&dev->port_ops); - swlib_free_attributes(&dev->vlan_ops); - free(dev); - - if (--refcount == 0) - swlib_priv_free(); -} - -void -swlib_free_all(struct switch_dev *dev) -{ - struct switch_dev *p; - - while (dev) { - p = dev->next; - swlib_free(dev); - dev = p; - } -} diff --git a/package/swconfig/src/swlib.h b/package/swconfig/src/swlib.h deleted file mode 100644 index e00ff47a5..000000000 --- a/package/swconfig/src/swlib.h +++ /dev/null @@ -1,213 +0,0 @@ -/* - * swlib.h: Switch configuration API (user space part) - * - * Copyright (C) 2008 Felix Fietkau - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - -Usage of the library functions: - - The main datastructure for a switch is the struct switch_device - To get started, you first need to use switch_connect() to probe - for switches and allocate an instance of this struct. - - There are two possible usage modes: - dev = switch_connect("eth0"); - - this call will look for a switch registered for the linux device - "eth0" and only allocate a switch_device for this particular switch. - - dev = switch_connect(NULL) - - this will return one switch_device struct for each available - switch. The switch_device structs are chained with by ->next pointer - - Then to query a switch for all available attributes, use: - swlib_scan(dev); - - All allocated datastructures for the switch_device struct can be freed with - swlib_free(dev); - or - swlib_free_all(dev); - - The latter traverses a whole chain of switch_device structs and frees them all - - Switch attributes (struct switch_attr) are divided into three groups: - dev->ops: - - global settings - dev->port_ops: - - per-port settings - dev->vlan_ops: - - per-vlan settings - - switch_lookup_attr() is a small helper function to locate attributes - by name. - - switch_set_attr() and switch_get_attr() can alter or request the values - of attributes. - -Usage of the switch_attr struct: - - ->atype: attribute group, one of: - - SWLIB_ATTR_GROUP_GLOBAL - - SWLIB_ATTR_GROUP_VLAN - - SWLIB_ATTR_GROUP_PORT - - ->id: identifier for the attribute - - ->type: data type, one of: - - SWITCH_TYPE_INT - - SWITCH_TYPE_STRING - - SWITCH_TYPE_PORT - - ->name: short name of the attribute - ->description: longer description - ->next: pointer to the next attribute of the current group - - -Usage of the switch_val struct: - - When setting attributes, following members of the struct switch_val need - to be set up: - - ->len (for attr->type == SWITCH_TYPE_PORT) - ->port_vlan: - - port number (for attr->atype == SWLIB_ATTR_GROUP_PORT), or: - - vlan number (for attr->atype == SWLIB_ATTR_GROUP_VLAN) - ->value.i (for attr->type == SWITCH_TYPE_INT) - ->value.s (for attr->type == SWITCH_TYPE_STRING) - - owned by the caller, not stored in the library internally - ->value.ports (for attr->type == SWITCH_TYPE_PORT) - - must point to an array of at lest val->len * sizeof(struct switch_port) - - When getting string attributes, val->value.s must be freed by the caller - When getting port list attributes, an internal static buffer is used, - which changes from call to call. - - */ - -#ifndef __SWLIB_H -#define __SWLIB_H - -enum swlib_attr_group { - SWLIB_ATTR_GROUP_GLOBAL, - SWLIB_ATTR_GROUP_VLAN, - SWLIB_ATTR_GROUP_PORT, -}; - -enum swlib_port_flags { - SWLIB_PORT_FLAG_TAGGED = (1 << 0), -}; - - -struct switch_dev; -struct switch_attr; -struct switch_port; -struct switch_val; - -struct switch_dev { - int id; - const char *name; - const char *dev_name; - int ports; - int vlans; - struct switch_attr *ops; - struct switch_attr *port_ops; - struct switch_attr *vlan_ops; - struct switch_dev *next; - void *priv; -}; - -struct switch_val { - struct switch_attr *attr; - int len; - int err; - int port_vlan; - union { - const char *s; - int i; - struct switch_port *ports; - } value; -}; - -struct switch_attr { - struct switch_dev *dev; - int atype; - int id; - int type; - const char *name; - const char *description; - struct switch_attr *next; -}; - -struct switch_port { - unsigned int id; - unsigned int flags; -}; - -/** - * swlib_connect: connect to the switch through netlink - * @name: name of the ethernet interface, - * - * if name is NULL, it connect and builds a chain of all switches - */ -struct switch_dev *swlib_connect(const char *name); - -/** - * swlib_free: free all dynamically allocated data for the switch connection - * @dev: switch device struct - * - * all members of a switch device chain (generated by swlib_connect(NULL)) - * must be freed individually - */ -void swlib_free(struct switch_dev *dev); - -/** - * swlib_free_all: run swlib_free on all devices in the chain - * @dev: switch device struct - */ -void swlib_free_all(struct switch_dev *dev); - -/** - * swlib_scan: probe the switch driver for available commands/attributes - * @dev: switch device struct - */ -int swlib_scan(struct switch_dev *dev); - -/** - * swlib_lookup_attr: look up a switch attribute - * @dev: switch device struct - * @type: global, port or vlan - * @name: name of the attribute - */ -struct switch_attr *swlib_lookup_attr(struct switch_dev *dev, - enum swlib_attr_group atype, const char *name); - -/** - * swlib_set_attr: set the value for an attribute - * @dev: switch device struct - * @attr: switch attribute struct - * @val: attribute value pointer - * returns 0 on success - */ -int swlib_set_attr(struct switch_dev *dev, struct switch_attr *attr, - struct switch_val *val); - -/** - * swlib_get_attr: get the value for an attribute - * @dev: switch device struct - * @attr: switch attribute struct - * @val: attribute value pointer - * returns 0 on success - * for string attributes, the result string must be freed by the caller - */ -int swlib_get_attr(struct switch_dev *dev, struct switch_attr *attr, - struct switch_val *val); - -#endif -- cgit v1.2.3 From 90bff25c39508a14b3b0763799b10716bf7b8433 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Jun 2010 00:11:21 +0200 Subject: do not call ldconfig when cross-compiling --- package/libpri/patches/patch-Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 package/libpri/patches/patch-Makefile (limited to 'package') diff --git a/package/libpri/patches/patch-Makefile b/package/libpri/patches/patch-Makefile new file mode 100644 index 000000000..e7e553e4a --- /dev/null +++ b/package/libpri/patches/patch-Makefile @@ -0,0 +1,10 @@ +--- libpri-1.4.10.2.orig/Makefile 2008-08-06 20:20:51.000000000 +0200 ++++ libpri-1.4.10.2/Makefile 2010-05-29 09:55:08.750000000 +0200 +@@ -146,7 +146,6 @@ $(STATIC_LIBRARY): $(STATIC_OBJS) + + $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) + $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) +- $(LDCONFIG) $(LDCONFIG_FLAGS) . + ln -sf libpri.so.$(SONAME) libpri.so + + version.c: FORCE -- cgit v1.2.3 From b9512d1774d2340888036c89d5ff7fc4a575cf1f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Jun 2010 00:12:26 +0200 Subject: fix cross-compile on Cygwin --- package/grep/patches/patch-src_system_h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 package/grep/patches/patch-src_system_h (limited to 'package') diff --git a/package/grep/patches/patch-src_system_h b/package/grep/patches/patch-src_system_h new file mode 100644 index 000000000..1eb3e7f03 --- /dev/null +++ b/package/grep/patches/patch-src_system_h @@ -0,0 +1,18 @@ +--- grep-2.5.4.orig/src/system.h 2009-01-31 06:39:54.000000000 +0100 ++++ grep-2.5.4/src/system.h 2010-05-29 00:08:24.703125000 +0200 +@@ -56,6 +56,7 @@ extern char *sys_errlist[]; + #ifdef __BEOS__ + # undef O_BINARY /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ + #endif ++/* + #ifdef HAVE_DOS_FILE_CONTENTS + # include + # ifdef HAVE_SETMODE +@@ -64,6 +65,7 @@ extern char *sys_errlist[]; + # define SET_BINARY(fd) _setmode (fd, O_BINARY) + # endif + #endif ++*/ + + #ifdef HAVE_DOS_FILE_NAMES + # define IS_SLASH(c) ((c) == '/' || (c) == '\\') -- cgit v1.2.3 From 64694819df952fd6b75fbcb5f4935fc933308f4b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Jun 2010 00:13:22 +0200 Subject: parallel build does not work for this package --- package/cyrus-sasl/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package') diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index 54dfc4195..d9724f2fc 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP+= openssl PKG_URL:= http://asg.web.cmu.edu/sasl PKG_SITES:= http://ftp.andrew.cmu.edu/pub/cyrus-mail/ +PKG_NOPARALLEL:= 1 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -- cgit v1.2.3 From 4670d5df0439de193c86b7cf4452d571da80ab31 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Jun 2010 00:14:24 +0200 Subject: update to stable version, fix cross-compile on Cygwin --- package/lynx/Makefile | 20 +- .../patch-WWW_Library_Implementation_www_tcp_h | 17 -- package/lynx/patches/patch-config_hin | 15 -- package/lynx/patches/patch-lynx_cfg | 236 --------------------- package/lynx/patches/patch-makefile_in | 22 -- package/lynx/patches/patch-samples_lynx_lss | 15 -- package/lynx/patches/patch-src_LYUtils_c | 15 -- .../lynx/patches/patch-src_chrtrans_makefile_in | 11 - package/lynx/patches/patch-src_chrtrans_makeuctb_c | 21 +- package/lynx/patches/patch-userdefs_h | 65 ------ 10 files changed, 26 insertions(+), 411 deletions(-) delete mode 100644 package/lynx/patches/patch-WWW_Library_Implementation_www_tcp_h delete mode 100644 package/lynx/patches/patch-config_hin delete mode 100644 package/lynx/patches/patch-lynx_cfg delete mode 100644 package/lynx/patches/patch-makefile_in delete mode 100644 package/lynx/patches/patch-samples_lynx_lss delete mode 100644 package/lynx/patches/patch-src_LYUtils_c delete mode 100644 package/lynx/patches/patch-src_chrtrans_makefile_in delete mode 100644 package/lynx/patches/patch-userdefs_h (limited to 'package') diff --git a/package/lynx/Makefile b/package/lynx/Makefile index edea58071..16d56d031 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -4,16 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME= lynx -PKG_VERSION= 2.8.7dev.7 -PKG_RELEASE= 2 -PKG_MD5SUM= 83891107c873421e5ac917cc0ab53fe8 +PKG_VERSION= 2.8.7 +PKG_RELEASE= 1 +PKG_MD5SUM= 124253e635f7c76bdffc47b9d036c812 PKG_DESCR:= Standard text browser PKG_SECTION:= text PKG_DEPENDS:= libncurses libopenssl zlib PKG_BUILDDEP+= ncurses openssl zlib -PKG_URL:= http://lynx.isc.org -PKG_SITES= http://lynx.isc.org/current/ \ - ${MASTER_SITE_MIRBSD} +PKG_URL:= http://lynx.isc.org/ +PKG_SITES= http://lynx.isc.org/${PKG_NAME}${PKG_VERSION}/ DISTFILES= ${PKG_NAME}${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/lynx2-8-7 @@ -22,7 +21,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LYNX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCPPFLAGS+= -DLYNX_VERSION=\"${PKG_VERSION}-${PKG_RELEASE}\" TCPPFLAGS+= -I${STAGING_DIR}/include/openssl TCPPFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT TLDFLAGS+= -lz @@ -40,11 +38,11 @@ CONFIGURE_ENV+= ac_cv_path_TELNET=telnet \ ac_cv_path_RM=rm \ ac_cv_path_UUDECODE=uudecode \ ac_cv_path_ZCAT=zcat \ - ac_cv_path_ZIP=zip + ac_cv_path_ZIP=zip \ + ac_cv_path_NCURSES_CONFIG=${STAGING_DIR}/scripts/ncurses5-config CONFIGURE_ARGS+= \ --disable-warnings \ - --disable-nls \ --without-gnutls \ --without-socks \ --without-socks5 \ @@ -63,6 +61,7 @@ CONFIGURE_ARGS+= \ --without-x \ --with-zlib=${STAGING_DIR}/usr \ --with-ssl=${STAGING_DIR}/usr \ + --with-curses-dir=${STAGING_DIR}/usr \ --disable-full-paths \ --with-cfg-file=/etc/lynx.cfg \ --with-lss-file=/etc/lynx.lss \ @@ -77,7 +76,8 @@ CONFIGURE_ARGS+= \ --disable-dired \ --with-screen=ncurses \ --disable-widec \ - --disable-locale-charset + --disable-locale-charset \ + --with-build-cppflags="-I/usr/include/ncurses" MAKE_FILE:= makefile diff --git a/package/lynx/patches/patch-WWW_Library_Implementation_www_tcp_h b/package/lynx/patches/patch-WWW_Library_Implementation_www_tcp_h deleted file mode 100644 index 67bc96b3b..000000000 --- a/package/lynx/patches/patch-WWW_Library_Implementation_www_tcp_h +++ /dev/null @@ -1,17 +0,0 @@ ---- lynx2-8-7.orig/WWW/Library/Implementation/www_tcp.h 2007-08-03 01:24:27.000000000 +0200 -+++ lynx2-8-7/WWW/Library/Implementation/www_tcp.h 2009-06-13 12:34:28.000000000 +0200 -@@ -777,12 +777,14 @@ Defaults - #ifndef NO_IOCTL - #include /* EJB */ - #endif /* !NO_IOCTL */ -+#ifndef HOSTBUILD - #include - #include - #ifdef HAVE_ARPA_INET_H - #include /* Must be after netinet/in.h */ - #endif - #include -+#endif - #endif /* TCP includes */ - - typedef unsigned short PortNumber; diff --git a/package/lynx/patches/patch-config_hin b/package/lynx/patches/patch-config_hin deleted file mode 100644 index 3728e5f7a..000000000 --- a/package/lynx/patches/patch-config_hin +++ /dev/null @@ -1,15 +0,0 @@ -This will expand to -| #define ICONV_CONST AM_ICONV */ -otherwise. - ---- lynx2-8-7.orig/config.hin 2007-08-03 01:24:27.000000000 +0200 -+++ lynx2-8-7/config.hin 2009-06-13 11:46:29.000000000 +0200 -@@ -176,7 +176,7 @@ - #undef HAVE___ARGZ_COUNT /* AM_GNU_GETTEXT */ - #undef HAVE___ARGZ_NEXT /* AM_GNU_GETTEXT */ - #undef HAVE___ARGZ_STRINGIFY /* AM_GNU_GETTEXT */ --#undef ICONV_CONST /* AM_ICONV */ -+#undef ICONV_CONST - #undef IGNORE_CTRL_C /* FIXME: make tests? */ - #undef INCLUDE_PROTOTYPES /* CF_SOCKS5 */ - #undef INSTALL_ARGS /* CF_PATH_PROG(install) */ diff --git a/package/lynx/patches/patch-lynx_cfg b/package/lynx/patches/patch-lynx_cfg deleted file mode 100644 index f28c4aa1f..000000000 --- a/package/lynx/patches/patch-lynx_cfg +++ /dev/null @@ -1,236 +0,0 @@ -$Id$ -$MirOS: ports/www/lynx/patches/patch-lynx_cfg,v 1.7 2007/05/20 12:06:19 tg Exp $ - - mostly site policy and compatibility, usability - ---- lynx2-8-7.orig/lynx.cfg 2007-05-18 00:53:22.000000000 +0200 -+++ lynx2-8-7/lynx.cfg 2009-06-13 11:46:29.000000000 +0200 -@@ -93,12 +93,12 @@ - # - # Normally we expect you will connect to a remote site, e.g., the Lynx starting - # site: --STARTFILE:http://lynx.isc.org/ -+#STARTFILE:http://lynx.isc.org/ - # - # As an alternative, you may want to use a local URL. A good choice for this is - # the user's home directory: - .ex --#STARTFILE:file://localhost/~/ -+STARTFILE:file://localhost/~/ - # - # Your choice of STARTFILE should reflect your site's needs, and be a URL that - # you can connect to reliably. Otherwise users will become confused and think -@@ -409,7 +409,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/ - # values and their relationship to the locale value is not. GNU libiconv - # happens to give useful values, but other implementations are not guaranteed - # to do this. --#LOCALE_CHARSET:FALSE -+LOCALE_CHARSET:TRUE - - - .h2 ASSUME_CHARSET -@@ -424,7 +424,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/ - # ASSUME_CHARSET can also be changed via the 'o'ptions menu but will - # not be saved as permanent value in user's .lynxrc file to avoid more chaos. - # --#ASSUME_CHARSET:iso-8859-1 -+ASSUME_CHARSET:utf-8 - - - .h2 ASSUMED_DOC_CHARSET_CHOICE -@@ -552,7 +552,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/ - # the 'o'ptions menu and save that preference in their RC file. - # This may be a comma-separated list of languages in decreasing preference. - # --#PREFERRED_LANGUAGE:en -+#PREFERRED_LANGUAGE: - - - .h2 PREFERRED_CHARSET -@@ -571,7 +571,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/ - # the sending of an unacceptable response is also allowed. See RFC 2068 - # (http://www.ics.uci.edu/pub/ietf/uri/rfc2068.txt). - # --#PREFERRED_CHARSET: -+PREFERRED_CHARSET:utf-8 - - - .h2 CHARSETS_DIRECTORY -@@ -652,22 +652,22 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/ - # Set the threshold # of lines Lynx must render before it - # redraws the screen in PARTIAL mode. Anything < 0 implies - # use of the screen size. --#PARTIAL_THRES:-1 -+PARTIAL_THRES:3 - - - .h2 SHOW_KB_RATE - # While getting large files, Lynx shows the approximate rate of transfer. --# Set this to change the units shown. "Kilobytes" denotes 1024 bytes: -+# Set this to change the units shown. - # NONE to disable the display of transfer rate altogether. --# TRUE or KB for Kilobytes/second. -+# TRUE or KB for Kibibytes/second. - # FALSE or BYTES for bytes/second. --# KB,ETA to show Kilobytes/second with estimated completion time. --# BYTES,ETA to show BYTES/second with estimated completion time. -+# KB,ETA to show Kibibytes/second with estimated completion time. -+# BYTES,ETA to show bytes/second with estimated completion time. - # Note that the "ETA" values are available if USE_READPROGRESS was defined. --#SHOW_KB_RATE:TRUE -+SHOW_KB_RATE:BYTES,ETA - - .h2 SHOW_KB_NAME --# Set the abbreviation for Kilobytes (1024). -+# Set the abbreviation for Kibibytes (1024 Bytes). - # Quoting from - # http://www.romulus2.com/articles/guides/misc/bitsbytes.shtml - # In December 1998, the International Electrotechnical Commission (IEC) -@@ -677,9 +677,6 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/ - # metric prefixes and adding the first two letters of the word "binary". Thus, - # for instance, instead of Kilobyte (KB) or Gigabyte (GB), the new terms would - # be kibibyte (KiB) or gibibyte (GiB). --# --# If you prefer using the conventional (and more common) "KB", modify this --# setting. - #SHOW_KB_NAME:KiB - - .h1 Timeouts -@@ -1076,7 +1073,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/ - # default or that defined here can be toggled via the -force_secure - # command line switch. - # --#FORCE_SSL_COOKIES_SECURE:FALSE -+FORCE_SSL_COOKIES_SECURE:TRUE - - - .h1 Internal Behavior -@@ -1263,7 +1260,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/ - # line break. Note that the valid way to insert extra blank lines in HTML - # is via a PRE block with only newlines in the block. - # --#COLLAPSE_BR_TAGS:TRUE -+COLLAPSE_BR_TAGS:FALSE - - - .h2 TAGSOUP -@@ -1366,7 +1363,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/ - # The default is FALSE, so that the feature needs to be enabled here - # explicitly if you want it. - # --#PERSISTENT_COOKIES:FALSE -+PERSISTENT_COOKIES:TRUE - - - .h2 COOKIE_FILE -@@ -1920,7 +1917,7 @@ DEFAULT_INDEX_FILE:http://lynx.isc.org/ - # prefer the more conservative action of requiring an explicit Y or y to - # confirm. The default defined here will override that in userdefs.h. - # --#QUIT_DEFAULT_YES:TRUE -+QUIT_DEFAULT_YES:FALSE - - - .h1 HTML Parsing -@@ -3208,7 +3205,7 @@ COLOR:6:brightred:black - # otherwise. Set this setting to TRUE if you prefer numbered links, but wish - # to get valid HTML source when printing or mailing when in psrc view. - # Default is FALSE. --#PRETTYSRC_VIEW_NO_ANCHOR_NUMBERING:FALSE -+PRETTYSRC_VIEW_NO_ANCHOR_NUMBERING:TRUE - - - .h1 HTML Parsing -@@ -3241,13 +3238,11 @@ COLOR:6:brightred:black - - .h2 JUSTIFY - # JUSTIFY - Appearance --# This option mirrors command-line option with same name. Default is TRUE. If --# true, most of text (except headers and like this) will be justified. This --# has no influence on CJK text rendering. --# --# This option is only available if Lynx was compiled with EXP_JUSTIFY_ELTS. -+# This option mirrors command-line option with same name. Default is FALSE. -+# If true, most of text (except headers and like this) will be justified. -+# This has no influence on CJK text rendering. - # --#JUSTIFY:FALSE -+JUSTIFY:TRUE - - .h2 JUSTIFY_MAX_VOID_PERCENT - # JUSTIFY_MAX_VOID_PERCENT - Appearance -@@ -3275,7 +3270,7 @@ COLOR:6:brightred:black - # explicit activation can also be requested with the -tna command line - # option. - # --#TEXTFIELDS_NEED_ACTIVATION:FALSE -+TEXTFIELDS_NEED_ACTIVATION:TRUE - - .h2 LEFTARROW_IN_TEXTFIELD_PROMPT - # LEFTARROW_IN_TEXTFIELD_PROMPT -@@ -3285,7 +3280,7 @@ COLOR:6:brightred:black - # only if the contents of the fields have been changed since entering it. - # If set to TRUE, the confirmation prompt is always issued. - # --#LEFTARROW_IN_TEXTFIELD_PROMPT:FALSE -+LEFTARROW_IN_TEXTFIELD_PROMPT:TRUE - - - .h1 Timeouts -@@ -3322,7 +3317,7 @@ COLOR:6:brightred:black - # one lynx.cfg setting. - .nf - #ENABLE_LYNXRC:accept_all_cookies:ON --#ENABLE_LYNXRC:assume_charset:OFF -+ENABLE_LYNXRC:assume_charset:ON - #ENABLE_LYNXRC:bookmark_file:ON - #ENABLE_LYNXRC:case_sensitive_searching:ON - #ENABLE_LYNXRC:character_set:ON -@@ -3337,34 +3332,35 @@ COLOR:6:brightred:black - #ENABLE_LYNXRC:emacs_keys:ON - #ENABLE_LYNXRC:file_editor:ON - #ENABLE_LYNXRC:file_sorting_method:ON --#ENABLE_LYNXRC:force_cookie_prompt:OFF --#ENABLE_LYNXRC:force_ssl_prompt:OFF --#ENABLE_LYNXRC:ftp_passive:OFF -+ENABLE_LYNXRC:force_cookie_prompt:ON -+ENABLE_LYNXRC:force_ssl_prompt:ON -+ENABLE_LYNXRC:ftp_passive:ON - #ENABLE_LYNXRC:kblayout:ON - #ENABLE_LYNXRC:keypad_mode:ON - #ENABLE_LYNXRC:lineedit_mode:ON - #ENABLE_LYNXRC:locale_charset:ON --#ENABLE_LYNXRC:make_links_for_all_images:OFF --#ENABLE_LYNXRC:make_pseudo_alts_for_inlines:OFF -+ENABLE_LYNXRC:make_links_for_all_images:ON -+ENABLE_LYNXRC:make_pseudo_alts_for_inlines:ON - #ENABLE_LYNXRC:multi_bookmark:ON - #ENABLE_LYNXRC:personal_mail_address:ON - #ENABLE_LYNXRC:preferred_charset:ON --#ENABLE_LYNXRC:preferred_encoding:OFF -+ENABLE_LYNXRC:preferred_encoding:ON - #ENABLE_LYNXRC:preferred_language:ON --#ENABLE_LYNXRC:preferred_media_types:OFF --#ENABLE_LYNXRC:raw_mode:OFF -+ENABLE_LYNXRC:preferred_media_types:ON -+ENABLE_LYNXRC:raw_mode:ON - #ENABLE_LYNXRC:run_all_execution_links:ON - #ENABLE_LYNXRC:run_execution_links_on_local_files:ON --#ENABLE_LYNXRC:scrollbar:OFF -+ENABLE_LYNXRC:scrollbar:ON - #ENABLE_LYNXRC:select_popups:ON --#ENABLE_LYNXRC:set_cookies:OFF -+ENABLE_LYNXRC:set_cookies:ON - #ENABLE_LYNXRC:show_color:ON - #ENABLE_LYNXRC:show_cursor:ON - #ENABLE_LYNXRC:show_dotfiles:ON --#ENABLE_LYNXRC:show_kb_rate:OFF -+ENABLE_LYNXRC:show_kb_name:OFF -+ENABLE_LYNXRC:show_kb_rate:ON - #ENABLE_LYNXRC:sub_bookmarks:ON - #ENABLE_LYNXRC:tagsoup:OFF --#ENABLE_LYNXRC:underline_links:OFF -+ENABLE_LYNXRC:underline_links:ON - #ENABLE_LYNXRC:user_mode:ON - #ENABLE_LYNXRC:useragent:OFF - #ENABLE_LYNXRC:verbose_images:ON diff --git a/package/lynx/patches/patch-makefile_in b/package/lynx/patches/patch-makefile_in deleted file mode 100644 index db687c433..000000000 --- a/package/lynx/patches/patch-makefile_in +++ /dev/null @@ -1,22 +0,0 @@ -$Id$ -$MirOS: ports/www/lynx/patches/patch-makefile_in,v 1.2 2007/05/20 12:06:19 tg Exp $ ---- lynx2-8-7.orig/makefile.in 2007-05-18 00:53:22.000000000 +0200 -+++ lynx2-8-7/makefile.in 2009-06-13 11:46:29.000000000 +0200 -@@ -161,13 +161,13 @@ SITE_DEFS = # Your defines here - # for installation of local execution links, please see the file userdefs.h - - WWW_CFLAGS = \ -- LY_CFLAGS="$(CFLAGS)" \ -- CPPFLAGS="$(CPPFLAGS)" \ -+ LY_CFLAGS='${CFLAGS}' \ -+ CPPFLAGS='${CPPFLAGS}' \ - LYFLAGS="$(SITE_LYDEFS)" - - SRC_CFLAGS = \ -- CFLAGS="$(CFLAGS)" \ -- CPPFLAGS="$(CPPFLAGS)" \ -+ CFLAGS='${CFLAGS}' \ -+ CPPFLAGS='${CPPFLAGS}' \ - LIBS="$(LIBS) $(RESOLVLIB) $(WAISLIB) $(SITE_LIBS)" \ - SITE_DEFS="$(SITE_DEFS)" \ - WWWINC=$(WWWINC) \ diff --git a/package/lynx/patches/patch-samples_lynx_lss b/package/lynx/patches/patch-samples_lynx_lss deleted file mode 100644 index eef0800eb..000000000 --- a/package/lynx/patches/patch-samples_lynx_lss +++ /dev/null @@ -1,15 +0,0 @@ -$MirOS: ports/www/lynx/patches/patch-samples_lynx_lss,v 1.2 2007/05/20 12:06:19 tg Exp $ - - usability - ---- lynx2-8-7.orig/samples/lynx.lss 2006-09-19 02:28:28.000000000 +0200 -+++ lynx2-8-7/samples/lynx.lss 2009-06-13 11:46:29.000000000 +0200 -@@ -6,7 +6,7 @@ - # If you really want the terminal's default colors, and if lynx is built using - # ncurses' default-color support, remove these two lines: - normal: normal: lightgray:black --default: normal: white:black -+default: normal: lightgray:black - - # Normal type styles correspond to HTML tags. - # diff --git a/package/lynx/patches/patch-src_LYUtils_c b/package/lynx/patches/patch-src_LYUtils_c deleted file mode 100644 index d8c02cb03..000000000 --- a/package/lynx/patches/patch-src_LYUtils_c +++ /dev/null @@ -1,15 +0,0 @@ -$MirOS: ports/www/lynx/patches/patch-src_LYUtils_c,v 1.3 2007/08/03 16:01:22 tg Exp $ - - Important for upstream too - ---- lynx2-8-7.orig/src/LYUtils.c 2007-08-03 01:24:27.000000000 +0200 -+++ lynx2-8-7/src/LYUtils.c 2009-06-13 11:46:29.000000000 +0200 -@@ -5903,7 +5903,7 @@ static BOOL IsOurSymlink(const char *nam - - if (cutoff != 0) { - HTSprintf0(&clone, "%.*s%s%s", -- cutoff - name, -+ (int)(cutoff - name), - name, PATHSEP_STR, buffer); - FREE(buffer); - buffer = clone; diff --git a/package/lynx/patches/patch-src_chrtrans_makefile_in b/package/lynx/patches/patch-src_chrtrans_makefile_in deleted file mode 100644 index 038b5b7ad..000000000 --- a/package/lynx/patches/patch-src_chrtrans_makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- lynx2-8-7.orig/src/chrtrans/makefile.in 2007-08-03 01:24:27.000000000 +0200 -+++ lynx2-8-7/src/chrtrans/makefile.in 2009-06-13 12:29:28.000000000 +0200 -@@ -50,7 +50,7 @@ CPP_OPTS = \ - -I$(top_srcdir)/$(WWWINC) \ - -I$(top_srcdir)/ \ - $(INTLDIR_CPPFLAGS) $(SITE_DEFS) $(BUILD_CPPFLAGS) --CC_OPTS = $(CPP_OPTS) $(BUILD_CFLAGS) -+CC_OPTS = $(CPP_OPTS) $(BUILD_CFLAGS) -DHOSTBUILD - - # - # This file contains the font map for the default (hardware) font diff --git a/package/lynx/patches/patch-src_chrtrans_makeuctb_c b/package/lynx/patches/patch-src_chrtrans_makeuctb_c index 9dcfdc73e..9f23671e7 100644 --- a/package/lynx/patches/patch-src_chrtrans_makeuctb_c +++ b/package/lynx/patches/patch-src_chrtrans_makeuctb_c @@ -1,11 +1,22 @@ ---- lynx2-8-7.orig/src/chrtrans/makeuctb.c 2007-08-03 01:24:27.000000000 +0200 -+++ lynx2-8-7/src/chrtrans/makeuctb.c 2009-06-13 11:54:42.000000000 +0200 -@@ -31,6 +31,9 @@ +--- lynx2-8-7.orig/src/chrtrans/makeuctb.c 2009-02-02 02:41:02.000000000 +0100 ++++ lynx2-8-7/src/chrtrans/makeuctb.c 2010-05-29 12:55:33.031250000 +0200 +@@ -18,6 +18,7 @@ + * version 2, or at your option any later version. + */ + ++ + #ifndef HAVE_CONFIG_H + /* override HTUtils.h fallbacks for cross-compiling */ + #undef HAVE_LSTAT +@@ -28,10 +29,12 @@ + + #define DONT_USE_GETTEXT + #define DONT_USE_SOCKS5 ++#define DONT_USE_SSL #include #include + #include -+#include -+#include + /* * Don't try to use LYexit() since this is a standalone file. diff --git a/package/lynx/patches/patch-userdefs_h b/package/lynx/patches/patch-userdefs_h deleted file mode 100644 index d39bc4c60..000000000 --- a/package/lynx/patches/patch-userdefs_h +++ /dev/null @@ -1,65 +0,0 @@ -$Id$ -$MirOS: ports/www/lynx/patches/patch-userdefs_h,v 1.9 2007/08/03 12:14:24 tg Exp $ ---- lynx2-8-7.orig/userdefs.h 2007-08-03 01:24:27.000000000 +0200 -+++ lynx2-8-7/userdefs.h 2009-06-13 11:46:29.000000000 +0200 -@@ -461,7 +461,7 @@ - * Normally we expect you will connect to a remote site, e.g., the Lynx starting - * site: - */ --#define STARTFILE "http://lynx.isc.org/" -+/* #define STARTFILE "http://lynx.isc.org/" */ - /* - * As an alternative, you may want to use a local URL. A good choice for this - * is the user's home directory: -@@ -471,6 +471,7 @@ - * you can connect to reliably. Otherwise users will become confused and think - * that they cannot run Lynx. - */ -+#define STARTFILE "file://localhost/~/" - - /***************************** - * HELPFILE must be defined as a URL and must have a -@@ -727,7 +728,7 @@ - * that preference in their RC file. This may be a comma-separated list - * of languages in decreasing preference. - */ --#define PREFERRED_LANGUAGE "en" -+#define PREFERRED_LANGUAGE "" - - /***************************** - * PREFERRED_CHARSET specifies the character set in MIME notation (e.g., -@@ -802,8 +803,8 @@ - * and use "http://" as the default (e.g., gopher.wfbr.edu or gopher.wfbr. - * will be made gopher://gopher.wfbr.edu). - */ --#define URL_DOMAIN_PREFIXES "www." --#define URL_DOMAIN_SUFFIXES ".com,.edu,.net,.org" -+#define URL_DOMAIN_PREFIXES "" -+#define URL_DOMAIN_SUFFIXES "" - - /******************************** - * If LIST_NEWS_NUMBERS is set TRUE, Lynx will use an ordered list -@@ -1371,7 +1372,9 @@ - * the version definition with the Project Version on checkout. Just - * ignore it. - kw */ - /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -+#ifndef LYNX_VERSION - #define LYNX_VERSION "2.8.7dev.7" -+#endif - #define LYNX_WWW_HOME "http://lynx.isc.org/" - #define LYNX_WWW_DIST "http://lynx.isc.org/current/" - /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ -@@ -1559,11 +1562,11 @@ - - /***************************** - * Uncomment the following line to enable the kanji code override routine. -- * The code can be changed by pressing ^L. More precisely, this allows -+ * The code can be changed by pressing Shift-J. More precisely, this allows - * the user to override the assumption about the kanji code for the document - * which Lynx has made on the basis of a META tag and HTTP response. - */ --/*#define KANJI_CODE_OVERRIDE */ -+#define KANJI_CODE_OVERRIDE - - - /**************************************************************** -- cgit v1.2.3 From 20b55d2954423e5c8d7107d64d94d805306514a5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Jun 2010 00:14:39 +0200 Subject: update to stable version, fix cross-compile on Cygwin --- .../patch-WWW_Library_Implementation_HTUtils_h | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h (limited to 'package') diff --git a/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h b/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h new file mode 100644 index 000000000..d16953cca --- /dev/null +++ b/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h @@ -0,0 +1,34 @@ +--- lynx2-8-7.orig/WWW/Library/Implementation/HTUtils.h 2009-05-25 23:05:31.000000000 +0200 ++++ lynx2-8-7/WWW/Library/Implementation/HTUtils.h 2010-05-29 12:56:42.125000000 +0200 +@@ -677,6 +677,8 @@ extern int WWW_TraceMask; + + #define SHORTENED_RBIND /* FIXME: do this in configure-script */ + ++#ifdef DONT_USE_SSL ++#else + #ifdef USE_SSL + + #define free_func free__func +@@ -717,6 +719,7 @@ extern int WWW_TraceMask; + + #undef free_func + #endif /* USE_SSL */ ++#endif + + #ifdef HAVE_LIBDMALLOC + #include /* Gray Watson's library */ +@@ -747,11 +750,14 @@ extern "C" { + + extern FILE *TraceFP(void); + ++#ifdef DONT_USE_SSL ++#else + #ifdef USE_SSL + extern SSL *HTGetSSLHandle(void); + extern void HTSSLInitPRNG(void); + extern int HTGetSSLCharacter(void *handle); + #endif /* USE_SSL */ ++#endif + + #ifdef __cplusplus + } -- cgit v1.2.3 From 342a958a68a59f2e70cff8cc5a77233aed5a9d58 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Jun 2010 00:15:09 +0200 Subject: disable for Cygwin --- package/php/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package') diff --git a/package/php/Makefile b/package/php/Makefile index adee72b2d..d0e5c81cc 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -44,6 +44,8 @@ PKG_SITES:= http://de.php.net/distributions/ PKG_DESCR_FCGI:= PHP for FastCGI usage +PKG_HOST_DEPENDS:= !cygwin + # FIX PKG_DEPENDS include $(TOPDIR)/mk/package.mk -- cgit v1.2.3 From 27954674d8c43999154076a2df1cc745626a3823 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Jun 2010 00:16:07 +0200 Subject: fix cross-compile on Cygwin --- package/pdnsd/Makefile | 4 +++- package/pdnsd/patches/patch-src_Makefile_in | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 package/pdnsd/patches/patch-src_Makefile_in (limited to 'package') diff --git a/package/pdnsd/Makefile b/package/pdnsd/Makefile index 64757186b..61db9b39c 100644 --- a/package/pdnsd/Makefile +++ b/package/pdnsd/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pdnsd PKG_VERSION:= 1.2.7 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 114b3b21b09b43cbfcccdde726b84c12 PKG_DESCR:= Proxy DNS server with permanent caching PKG_SECTION:= net @@ -21,6 +21,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PDNSD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ARGS+= --with-target=Linux + post-install: $(INSTALL_DIR) $(IDIR_PDNSD)/etc ${INSTALL_DATA} ./files/pdnsd.conf ${IDIR_PDNSD}/etc/ diff --git a/package/pdnsd/patches/patch-src_Makefile_in b/package/pdnsd/patches/patch-src_Makefile_in new file mode 100644 index 000000000..6ab8de4e1 --- /dev/null +++ b/package/pdnsd/patches/patch-src_Makefile_in @@ -0,0 +1,11 @@ +--- pdnsd-1.2.7.orig/src/Makefile.in 2008-09-04 18:20:37.000000000 +0200 ++++ pdnsd-1.2.7/src/Makefile.in 2010-05-29 17:45:45.937500000 +0200 +@@ -171,7 +171,7 @@ pdnsd_SOURCES = conf-parser.c conff.c co + rr_types.h servers.h status.h thread.h cache.h hash.h pdnsd_assert.h \ + freebsd_netinet_ip_icmp.h + +-SUBDIRS = pdnsd-ctl rc test ++SUBDIRS = pdnsd-ctl rc + all: all-recursive + + .SUFFIXES: -- cgit v1.2.3 From b240ad215b66df5ca95426eb8c4fcc93924be8b7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Jun 2010 00:17:16 +0200 Subject: disable on Cygwin host --- package/python/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package') diff --git a/package/python/Makefile b/package/python/Makefile index ad694d872..32f7de0e4 100644 --- a/package/python/Makefile +++ b/package/python/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= lang PKG_URL:= http://www.python.org PKG_SITES:= http://www.python.org/ftp/python/3.1.1/ -PKG_HOST_DEPENDS:= !netbsd !openbsd +PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin DISTFILES= Python-${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/Python-${PKG_VERSION} -- cgit v1.2.3 From 7027e2c318e1f47e914015fc0f13992a4dcbb32a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Jun 2010 00:18:33 +0200 Subject: update to latest upstream and fix cross-compile on Cygwin --- package/pptpd/Makefile | 6 ++-- package/pptpd/patches/bad-pqueue-debug.patch | 20 ------------- package/pptpd/patches/patch-Makefile_in | 11 +++++++ package/pptpd/patches/patch-ctrlpacket_c | 11 ++++--- package/pptpd/patches/patch-plugins_Makefile | 11 +++++++ .../pptpd/patches/pptpgre-use-debug-option.patch | 35 ---------------------- 6 files changed, 30 insertions(+), 64 deletions(-) delete mode 100644 package/pptpd/patches/bad-pqueue-debug.patch create mode 100644 package/pptpd/patches/patch-Makefile_in create mode 100644 package/pptpd/patches/patch-plugins_Makefile delete mode 100644 package/pptpd/patches/pptpgre-use-debug-option.patch (limited to 'package') diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index 01e1147c0..13ea21a66 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pptpd -PKG_VERSION:= 1.3.0 -PKG_RELEASE:= 9 -PKG_MD5SUM:= 75d494e881f7027f4e60b114163f6b67 +PKG_VERSION:= 1.3.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= b38df9c431041922c997c1148bedf591 PKG_DESCR:= a Point-to-Point Tunneling Protocol (PPTP) server PKG_SECTION:= net PKG_DEPENDS:= ppp kmod-crypto kmod-mppe kmod-ppp diff --git a/package/pptpd/patches/bad-pqueue-debug.patch b/package/pptpd/patches/bad-pqueue-debug.patch deleted file mode 100644 index bfd185d41..000000000 --- a/package/pptpd/patches/bad-pqueue-debug.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urN pptpd-1.3.0/pqueue.c.orig pptpd-1.3.0/pqueue.c ---- pptpd-1.3.0.orig/pqueue.c 2005-03-31 06:55:53.000000000 +0200 -+++ pptpd-1.3.0/pqueue.c 2008-10-14 13:30:20.000000000 +0200 -@@ -6,14 +6,11 @@ - #include "pqueue.h" - - #ifdef DEBUG_PQUEUE --#define DEBUG_ON 1 -+#define DEBUG_CMD(_a) { _a } - #else --#define DEBUG_ON 0 -+#define DEBUG_CMD(_a) - #endif - --#define DEBUG_CMD(_a) if (DEBUG_ON) { _a } -- -- - #define MIN_CAPACITY 128 /* min allocated buffer for a packet */ - - static int pqueue_alloc (int seq, unsigned char *packet, int packlen, pqueue_t **new); diff --git a/package/pptpd/patches/patch-Makefile_in b/package/pptpd/patches/patch-Makefile_in new file mode 100644 index 000000000..23a5b8420 --- /dev/null +++ b/package/pptpd/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- pptpd-1.3.4.orig/Makefile.in 2007-04-16 03:10:27.000000000 +0200 ++++ pptpd-1.3.4/Makefile.in 2010-05-29 18:48:12.250000000 +0200 +@@ -104,7 +104,7 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ +-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' ++CFLAGS = -Wall -DSBINDIR='"$(sbindir)"' + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ diff --git a/package/pptpd/patches/patch-ctrlpacket_c b/package/pptpd/patches/patch-ctrlpacket_c index f1a456de0..bd4e3dfea 100644 --- a/package/pptpd/patches/patch-ctrlpacket_c +++ b/package/pptpd/patches/patch-ctrlpacket_c @@ -1,15 +1,14 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- pptpd-1.3.0.orig/ctrlpacket.c 2004-04-29 08:58:45.000000000 +0200 -+++ pptpd-1.3.0/ctrlpacket.c 2008-10-14 13:43:14.000000000 +0200 -@@ -376,9 +376,9 @@ void deal_start_ctrl_conn(unsigned char +--- pptpd-1.3.4.orig/ctrlpacket.c 2005-08-03 11:10:59.000000000 +0200 ++++ pptpd-1.3.4/ctrlpacket.c 2010-05-30 00:33:57.437500000 +0200 +@@ -377,9 +377,9 @@ void deal_start_ctrl_conn(unsigned char start_ctrl_conn_rply.bearer_cap = htons(OUR_BEARER); start_ctrl_conn_rply.max_channels = htons(MAX_CHANNELS); start_ctrl_conn_rply.firmware_rev = htons(PPTP_FIRMWARE_VERSION); - bzero(start_ctrl_conn_rply.hostname, MAX_HOSTNAME_SIZE); + memset(start_ctrl_conn_rply.hostname, 0, MAX_HOSTNAME_SIZE); - strncpy(start_ctrl_conn_rply.hostname, PPTP_HOSTNAME, MAX_HOSTNAME_SIZE); + strncpy((char *)start_ctrl_conn_rply.hostname, PPTP_HOSTNAME, MAX_HOSTNAME_SIZE); - bzero(start_ctrl_conn_rply.vendor, MAX_VENDOR_SIZE); + memset(start_ctrl_conn_rply.vendor, 0, MAX_VENDOR_SIZE); - strncpy(start_ctrl_conn_rply.vendor, PPTP_VENDOR, MAX_VENDOR_SIZE); + strncpy((char *)start_ctrl_conn_rply.vendor, PPTP_VENDOR, MAX_VENDOR_SIZE); COPY_CTRL_PACKET(start_ctrl_conn_rply, rply_packet, rply_size); DEBUG_PACKET("START CTRL CONN RPLY"); diff --git a/package/pptpd/patches/patch-plugins_Makefile b/package/pptpd/patches/patch-plugins_Makefile new file mode 100644 index 000000000..cb32dd4ce --- /dev/null +++ b/package/pptpd/patches/patch-plugins_Makefile @@ -0,0 +1,11 @@ +--- pptpd-1.3.4.orig/plugins/Makefile 2006-08-03 04:02:01.000000000 +0200 ++++ pptpd-1.3.4/plugins/Makefile 2010-05-30 00:31:31.390625000 +0200 +@@ -1,6 +1,6 @@ +-CC = gcc ++CC ?= gcc + COPTS = -O2 -g +-CFLAGS = $(COPTS) -I.. -I../../include -fPIC ++CFLAGS ?= $(COPTS) -I.. -I../../include -fPIC + LDFLAGS = -shared + LDADD = -lutil + INSTALL = install -o root diff --git a/package/pptpd/patches/pptpgre-use-debug-option.patch b/package/pptpd/patches/pptpgre-use-debug-option.patch deleted file mode 100644 index cd1df7703..000000000 --- a/package/pptpd/patches/pptpgre-use-debug-option.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Nur pptpd-1.3.0/pptpgre.c.orig pptpd-1.3.0/pptpgre.c ---- pptpd-1.3.0.orig/pptpgre.c 2005-08-02 13:33:31.000000000 +0200 -+++ pptpd-1.3.0/pptpgre.c 2008-10-14 13:30:20.000000000 +0200 -@@ -46,6 +46,9 @@ - - #define PACKET_MAX 8196 - -+/* Command Line Variable Args */ -+extern int pptpctrl_debug; -+ - typedef int (*callback_t)(int cl, void *pack, unsigned int len); - - /* test for a 32 bit counter overflow */ -@@ -319,7 +322,9 @@ static int dequeue_gre (callback_t callb - stats.rx_lost += head->seq - gre.seq_recv - 1; - syslog(LOG_DEBUG, "GRE: timeout waiting for %d packets", head->seq - gre.seq_recv - 1); - } -- syslog(LOG_DEBUG, "GRE: accepting #%d from queue", head->seq); -+ if (pptpctrl_debug) { -+ syslog(LOG_DEBUG, "GRE: accepting #%d from queue", head->seq); -+ } - gre.seq_recv = head->seq; - status = callback(cl, head->packet, head->packlen); - pqueue_del(head); -@@ -399,7 +404,9 @@ int decaps_gre(int fd, int (*cb) (int cl - } - /* check for out-of-order sequence number */ - if (seq_greater(seq, gre.seq_recv)) { -- syslog(LOG_DEBUG, "GRE: accepting packet #%d", seq); -+ if (pptpctrl_debug) { -+ syslog(LOG_DEBUG, "GRE: accepting packet #%d", seq); -+ } - stats.rx_accepted++; - gre.seq_recv = seq; - return cb(cl, buffer + ip_len + headersize, payload_len); -- cgit v1.2.3 From 3e3e46cbe4e9e03518321e5e05834b27717ced2a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Jun 2010 00:19:00 +0200 Subject: use flex explicitely --- package/pcmciautils/patches/patch-Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/pcmciautils/patches/patch-Makefile b/package/pcmciautils/patches/patch-Makefile index 821753ddc..313c2bb84 100644 --- a/package/pcmciautils/patches/patch-Makefile +++ b/package/pcmciautils/patches/patch-Makefile @@ -1,6 +1,6 @@ --- pcmciautils-017.orig/Makefile 2010-01-06 16:47:45.000000000 +0100 -+++ pcmciautils-017/Makefile 2010-05-13 14:06:30.741613760 +0200 -@@ -94,7 +94,7 @@ PWD = $(shell pwd) ++++ pcmciautils-017/Makefile 2010-05-29 17:15:03.515625000 +0200 +@@ -94,12 +94,13 @@ PWD = $(shell pwd) # If you are running a cross compiler, you may want to set this # to something more interesting, like "arm-linux-". If you want # to compile vs uClibc, that can be done here as well. @@ -9,3 +9,9 @@ CC = $(CROSS)gcc LD = $(CROSS)gcc AR = $(CROSS)ar + STRIP = $(CROSS)strip + RANLIB = $(CROSS)ranlib ++LEX = flex + HOSTCC = gcc + + export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ARCH_LIB_OBJS CRT0 -- cgit v1.2.3 From b515254a71f42650a17b99586647da92395d393b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Jun 2010 00:19:51 +0200 Subject: update to latest upstream and fix Cygwin cross-compile --- package/proftpd/Makefile | 4 +-- package/proftpd/patches/patch-Make_rules_in | 8 +++--- package/proftpd/patches/patch-Makefile_in | 12 ++++----- .../proftpd/patches/patch-modules_mod_auth_unix_c | 29 ++++++++++++++++++++++ 4 files changed, 41 insertions(+), 12 deletions(-) create mode 100644 package/proftpd/patches/patch-modules_mod_auth_unix_c (limited to 'package') diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile index d74ff9e35..840cde048 100644 --- a/package/proftpd/Makefile +++ b/package/proftpd/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= proftpd -PKG_VERSION:= 1.3.2b +PKG_VERSION:= 1.3.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 4918908fcae9e591ba84c66edff73410 +PKG_MD5SUM:= 97ad29f31f4fe633a9f8d021bab2df20 PKG_DESCR:= An advanced and very configurable FTP server PKG_SECTION:= utils PKG_NOPARALLEL:= 1 diff --git a/package/proftpd/patches/patch-Make_rules_in b/package/proftpd/patches/patch-Make_rules_in index 6f12634fa..e305b0c38 100644 --- a/package/proftpd/patches/patch-Make_rules_in +++ b/package/proftpd/patches/patch-Make_rules_in @@ -1,7 +1,7 @@ do not try to set user or group id when installing ---- proftpd-1.3.2b.orig/Make.rules.in 2008-11-19 04:51:38.000000000 +0100 -+++ proftpd-1.3.2b/Make.rules.in 2010-01-27 23:00:19.000000000 +0100 -@@ -29,9 +29,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@ +--- proftpd-1.3.3.orig/Make.rules.in 2009-11-18 22:48:25.000000000 +0100 ++++ proftpd-1.3.3/Make.rules.in 2010-05-30 12:47:38.265625000 +0200 +@@ -28,9 +28,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@ INSTALL=@INSTALL@ INSTALL_USER=@install_user@ INSTALL_GROUP=@install_group@ @@ -13,4 +13,4 @@ +INSTALL_MAN=$(INSTALL) -m 0644 RM=rm -f - SHELL=/bin/sh + SHELL=@CONFIG_SHELL@ diff --git a/package/proftpd/patches/patch-Makefile_in b/package/proftpd/patches/patch-Makefile_in index 338a3b691..0f1bdd799 100644 --- a/package/proftpd/patches/patch-Makefile_in +++ b/package/proftpd/patches/patch-Makefile_in @@ -1,15 +1,15 @@ hiding it won't help, we install as non-root so no chown possible ---- proftpd-1.3.2b.orig/Makefile.in 2008-11-19 04:51:38.000000000 +0100 -+++ proftpd-1.3.2b/Makefile.in 2010-01-20 18:03:40.552178286 +0100 -@@ -76,7 +76,6 @@ check: proftpd$(EXEEXT) - $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(rundir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: +--- proftpd-1.3.3.orig/Makefile.in 2009-12-16 00:24:42.000000000 +0100 ++++ proftpd-1.3.3/Makefile.in 2010-05-30 12:47:41.187500000 +0200 +@@ -79,7 +79,6 @@ check: proftpd$(EXEEXT) + $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: @if [ ! -d $@ ]; then \ mkdir -p $@; \ - chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ chmod 0755 $@; \ fi -@@ -86,7 +85,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc +@@ -89,7 +88,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ fi ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd @@ -17,7 +17,7 @@ install-libs: $(DESTDIR)$(libdir)/proftpd cd lib/ && $(MAKE) install -@@ -121,11 +119,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE +@@ -125,11 +123,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE $(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut $(INSTALL_BIN) ftptop $(DESTDIR)$(bindir)/ftptop $(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho diff --git a/package/proftpd/patches/patch-modules_mod_auth_unix_c b/package/proftpd/patches/patch-modules_mod_auth_unix_c new file mode 100644 index 000000000..a439d6b5a --- /dev/null +++ b/package/proftpd/patches/patch-modules_mod_auth_unix_c @@ -0,0 +1,29 @@ +--- proftpd-1.3.3.orig/modules/mod_auth_unix.c 2009-10-14 20:49:31.000000000 +0200 ++++ proftpd-1.3.3/modules/mod_auth_unix.c 2010-05-30 13:02:15.515625000 +0200 +@@ -77,6 +77,7 @@ + # endif + #endif /* PR_USE_SIA */ + ++/* + #ifdef CYGWIN + typedef void *HANDLE; + typedef unsigned long DWORD; +@@ -85,7 +86,8 @@ typedef unsigned long DWORD; + DWORD WINAPI GetVersion(void); + extern HANDLE cygwin_logon_user (const struct passwd *, const char *); + extern void cygwin_set_impersonation_token (const HANDLE); +-#endif /* CYGWIN */ ++#endif ++*/ + + #ifdef SETGRENT_VOID + # define RETSETGRENTTYPE void +@@ -738,7 +740,7 @@ MODRET pw_check(cmd_rec *cmd) { + + #else /* !PR_USE_SIA */ + +-# ifdef CYGWIN ++# if 0 + /* We have to do special Windows NT voodoo with Cygwin in order to be + * able to switch UID/GID. More info at + * http://cygwin.com/cygwin-ug-net/ntsec.html#NTSEC-SETUID -- cgit v1.2.3 From d17c4dabd304f8f0a2e334f7a5b171f7e0b87bf4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Jun 2010 00:20:06 +0200 Subject: disable on Cygwin host --- package/nss/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package') diff --git a/package/nss/Makefile b/package/nss/Makefile index 7acbacbe4..e4795f261 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -15,6 +15,7 @@ PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/ PKG_SITES:= https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/ PKG_TARGET_DEPENDS:= !foxboard +PKG_HOST_DEPENDS:= !cygwin WRKSRC= ${WRKDIST}/mozilla/security/nss -- cgit v1.2.3 From 94ae124a426341aa78a837e226cf926909e256a9 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 2 Jun 2010 00:52:17 +0200 Subject: gpm: add init script, give sample flags working on lemote --- package/gpm/files/gpm.init | 28 ++++++++++++++++++++++++++++ package/gpm/files/gpm.postinst | 4 ++++ 2 files changed, 32 insertions(+) create mode 100644 package/gpm/files/gpm.init create mode 100644 package/gpm/files/gpm.postinst (limited to 'package') diff --git a/package/gpm/files/gpm.init b/package/gpm/files/gpm.init new file mode 100644 index 000000000..812fc1bf7 --- /dev/null +++ b/package/gpm/files/gpm.init @@ -0,0 +1,28 @@ +#!/bin/sh +#PKG gpm +#INIT 80 + +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${gpm:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + /usr/sbin/gpm $gpm_flags + ;; +stop) + pkill gpm + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "Usage: $0 {start | stop | restart}" + exit 1 + ;; +esac +exit $? diff --git a/package/gpm/files/gpm.postinst b/package/gpm/files/gpm.postinst new file mode 100644 index 000000000..82e63cf25 --- /dev/null +++ b/package/gpm/files/gpm.postinst @@ -0,0 +1,4 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf 'options passed to gpm' gpm_flags "-m /dev/psaux -t ps2" +add_rcconf gpm gpm NO -- cgit v1.2.3 From e21c5f005ad02185bebbf0782b3e7245879ca19a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 3 Jun 2010 14:40:20 +0200 Subject: fix package build --- package/pptpd/patches/patch-ctrlpacket_c | 4 ++-- package/pptpd/patches/patch-plugins_Makefile | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/pptpd/patches/patch-ctrlpacket_c b/package/pptpd/patches/patch-ctrlpacket_c index bd4e3dfea..4cfb5a3b1 100644 --- a/package/pptpd/patches/patch-ctrlpacket_c +++ b/package/pptpd/patches/patch-ctrlpacket_c @@ -1,6 +1,6 @@ --- pptpd-1.3.4.orig/ctrlpacket.c 2005-08-03 11:10:59.000000000 +0200 -+++ pptpd-1.3.4/ctrlpacket.c 2010-05-30 00:33:57.437500000 +0200 -@@ -377,9 +377,9 @@ void deal_start_ctrl_conn(unsigned char ++++ pptpd-1.3.4/ctrlpacket.c 2010-06-03 14:37:05.610979335 +0200 +@@ -377,9 +377,9 @@ void deal_start_ctrl_conn(unsigned char start_ctrl_conn_rply.bearer_cap = htons(OUR_BEARER); start_ctrl_conn_rply.max_channels = htons(MAX_CHANNELS); start_ctrl_conn_rply.firmware_rev = htons(PPTP_FIRMWARE_VERSION); diff --git a/package/pptpd/patches/patch-plugins_Makefile b/package/pptpd/patches/patch-plugins_Makefile index cb32dd4ce..937e62ddf 100644 --- a/package/pptpd/patches/patch-plugins_Makefile +++ b/package/pptpd/patches/patch-plugins_Makefile @@ -1,5 +1,5 @@ --- pptpd-1.3.4.orig/plugins/Makefile 2006-08-03 04:02:01.000000000 +0200 -+++ pptpd-1.3.4/plugins/Makefile 2010-05-30 00:31:31.390625000 +0200 ++++ pptpd-1.3.4/plugins/Makefile 2010-06-03 14:39:12.120974815 +0200 @@ -1,6 +1,6 @@ -CC = gcc +CC ?= gcc @@ -9,3 +9,12 @@ LDFLAGS = -shared LDADD = -lutil INSTALL = install -o root +@@ -18,7 +18,7 @@ all: $(PLUGINS) + %.so: %.c + $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD) + +-LIBDIR ?= $(DESTDIR)$(prefix)/lib/pptpd ++LIBDIR = $(DESTDIR)$(prefix)/lib/pptpd + + install: $(PLUGINS) + $(INSTALL) -d $(LIBDIR) -- cgit v1.2.3