Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 18 commits
  • 34 files changed
  • 0 commit comments
  • 4 contributors
Commits on May 17, 2012
jogo packages: remove empty directories
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31766 3c298f89-4303-0410-b956-a3cf2f4a3e73
83e1ac6
Commits on May 18, 2012
swalker [packages] bluelog: update to 1.0.3
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31782 3c298f89-4303-0410-b956-a3cf2f4a3e73
376f0dc
nbd remove linux-uvc, it is obsolete
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31793 3c298f89-4303-0410-b956-a3cf2f4a3e73
ee86093
nbd remove nw802-2.4, it is obsolete
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31794 3c298f89-4303-0410-b956-a3cf2f4a3e73
aabb707
nbd remove ov51x-jpeg, it is obsolete
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31795 3c298f89-4303-0410-b956-a3cf2f4a3e73
780abf7
nbd remove qc-usb, it is obsolete
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31796 3c298f89-4303-0410-b956-a3cf2f4a3e73
8c8d35a
nbd remove spca5xx, it is obsolete
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31797 3c298f89-4303-0410-b956-a3cf2f4a3e73
696963e
nbd remove et131x, it is obsolete
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31798 3c298f89-4303-0410-b956-a3cf2f4a3e73
badd7e4
nbd dsl-qos-queue: remove obsolete kernel version dependencies
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31799 3c298f89-4303-0410-b956-a3cf2f4a3e73
29c98d0
nbd strace: remove old kernel version based version override
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31800 3c298f89-4303-0410-b956-a3cf2f4a3e73
c257c2f
Commits on May 19, 2012
swalker [packages] socat: update to 1.7.2.1 (CVE-2012-0219), use CONFIGURE_{A…
…RGS,VARS}

- Update socat to 1.7.2.0 
(main reason: avoids compile-error against kernel 3.3.5 with ext2_fs.h which seems to got removed/changed to not being used from userspace from current kernel)
- remove 502-no_sslv2.patch which doesn't apply surely and looks quite outdated to me, socat isn't linked against *ssl* anyway, compiles and works fine, verified on ar71xx

Michael

Signed-off-by: Michael Markstaller <mm@elabnet.de>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@31818 3c298f89-4303-0410-b956-a3cf2f4a3e73
e05fa10
Commits on May 20, 2012
swalker [packages] php5: add support for php5 calendar module
Signed-off-by: Gerald Matzka <mgerald21@yahoo.de>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@31823 3c298f89-4303-0410-b956-a3cf2f4a3e73
b8e7185
swalker [packages] fwknop: update to 2.0, use new startup commands
Signed-off-by: Jonathan Bennett <jbscience87@gmail.com>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@31824 3c298f89-4303-0410-b956-a3cf2f4a3e73
2f1935d
swalker [packages] htop: update to 1.0.1
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31825 3c298f89-4303-0410-b956-a3cf2f4a3e73
32308bf
swalker [packages] libevent2: update to 2.0.19
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31826 3c298f89-4303-0410-b956-a3cf2f4a3e73
f4269ce
swalker [packages] gnupg: update to 1.4.12, remove obsolete patch
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31827 3c298f89-4303-0410-b956-a3cf2f4a3e73
6a52055
swalker [packages] oww: update to 0.86.1
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31828 3c298f89-4303-0410-b956-a3cf2f4a3e73
cdc7962
obsy [packages] transmission: update to 2.52
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31829 3c298f89-4303-0410-b956-a3cf2f4a3e73
70c69fd
Showing with 69 additions and 3,977 deletions.
  1. +3 −3 admin/htop/Makefile
  2. +11 −4 lang/php5/Makefile
  3. +3 −3 libs/libevent2/Makefile
  4. +0 −42 multimedia/linux-uvc/Makefile
  5. +0 −44 multimedia/nw802-2.4/Makefile
  6. +0 −2,980 multimedia/nw802-2.4/patches/001-linux_2_6_cvs.patch
  7. +0 −134 multimedia/nw802-2.4/patches/100-compile_fix.patch
  8. +0 −75 multimedia/ov51x-jpeg/Makefile
  9. +0 −20 multimedia/ov51x-jpeg/patches/100-compile_fix.patch
  10. +0 −91 multimedia/qc-usb/Makefile
  11. +0 −44 multimedia/qc-usb/patches/001-linux_2_6.patch
  12. +0 −11 multimedia/qc-usb/patches/002-qc_set_cross_compile.patch
  13. +0 −25 multimedia/qc-usb/patches/003-linux_2_6_27.patch
  14. +0 −108 multimedia/qc-usb/patches/004-linux_2_6_28.patch
  15. +0 −40 multimedia/spca5xx-le/Makefile
  16. +0 −21 multimedia/spca5xx-le/patches/100-compile_pud_shift.patch
  17. +0 −13 multimedia/spca5xx-le/patches/101-linux_2_6.patch
  18. +0 −54 multimedia/spca5xx-view/Makefile
  19. +0 −4 multimedia/spca5xx-view/files/servfox.config
  20. +0 −25 multimedia/spca5xx-view/files/servfox.init
  21. +1 −1 net/dsl-qos-queue/Makefile
  22. +0 −58 net/et131x/Makefile
  23. +3 −3 net/fwknop/Makefile
  24. +2 −2 net/fwknop/patches/001-fix_config.patch
  25. +17 −0 net/fwknop/patches/002-fix_init.patch
  26. +16 −18 net/socat/Makefile
  27. +1 −1 net/socat/patches/501-honor_ldflags.patch
  28. +0 −48 net/socat/patches/502-no_sslv2.patch
  29. +2 −2 net/transmission/Makefile
  30. +2 −2 utils/bluelog/Makefile
  31. +3 −3 utils/gnupg/Makefile
  32. +0 −86 utils/gnupg/patches/001-mips_gcc4.4.patch
  33. +2 −2 utils/oww/Makefile
  34. +3 −10 utils/strace/Makefile
View
6 admin/htop/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=htop
-PKG_VERSION:=1.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.0.1
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=325112ca7947ea1f6d6441f631e00384
+PKG_MD5SUM:=d3b80d905a6bff03f13896870787f901
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
View
15 lang/php5/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=php
PKG_VERSION:=5.3.10
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.php.net/distributions/
@@ -20,7 +20,7 @@ PKG_BUILD_PARALLEL:=1
PHP5_MODULES = \
apc \
- ctype curl \
+ calendar ctype curl \
fileinfo \
dio dom \
exif \
@@ -56,7 +56,7 @@ define Package/php5/Default
endef
define Package/php5/Default/description
- PHP is a widely-used general-purpose scripting language that is especially
+ PHP is a widely-used general-purpose scripting language that is especially
suited for Web development and can be embedded into HTML.
endef
@@ -89,7 +89,7 @@ endef
define Package/php5/description
$(call Package/php5/Default/description)
- This package contains only the PHP config file. You must actually choose
+ This package contains only the PHP config file. You must actually choose
your PHP flavour (cli, cgi or fastcgi).
endef
@@ -159,6 +159,12 @@ else
CONFIGURE_ARGS+= --disable-apc
endif
+ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-calendar),)
+ CONFIGURE_ARGS+= --enable-calendar=shared
+else
+ CONFIGURE_ARGS+= --disable-calendar
+endif
+
ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ctype),)
CONFIGURE_ARGS+= --enable-ctype=shared
else
@@ -521,6 +527,7 @@ $(eval $(call BuildPackage,php5-fastcgi))
#$(eval $(call BuildModule,NAME,TITLE[,PKG DEPENDS]))
$(eval $(call BuildModule,apc,APC,+PACKAGE_php5-mod-apc:librt))
+$(eval $(call BuildModule,calendar,Calendar))
$(eval $(call BuildModule,ctype,Ctype))
$(eval $(call BuildModule,curl,cURL,+PACKAGE_php5-mod-curl:libcurl))
$(eval $(call BuildModule,fileinfo,Fileinfo,+PACKAGE_php5-mod-fileinfo:libmagic))
View
6 libs/libevent2/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2011 OpenWrt.org
+# Copyright (C) 2011-2012 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libevent2
-PKG_VERSION:=2.0.16
+PKG_VERSION:=2.0.19
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/libevent-$(PKG_VERSION)-stable
PKG_SOURCE:=libevent-$(PKG_VERSION)-stable.tar.gz
PKG_SOURCE_URL:=http://www.monkey.org/~provos/ \
@SF/levent
-PKG_MD5SUM:=899efcffccdb3d5111419df76e7dc8df
+PKG_MD5SUM:=91111579769f46055b0a438f5cc59572
PKG_FIXUP:=libtool
PKG_INSTALL:=1
View
42 multimedia/linux-uvc/Makefile
@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2007-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=linux-uvc
-PKG_REV:=261
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://svn.berlios.de/svnroot/repos/linux-uvc/linux-uvc/trunk/
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=svn
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/video-uvc-obsolete
- SUBMENU:=Video Support
- TITLE:=USB Video Class (UVC) support (obsolete)
- URL:=http://linux-uvc.berlios.de/
- DEPENDS:=@LINUX_2_6_23||LINUX_2_6_24||LINUX_2_6_25 @USB_SUPPORT +kmod-usb-core +kmod-video-core
- FILES:=$(PKG_BUILD_DIR)/uvcvideo.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,90,uvcvideo)
-endef
-
-define Build/Compile
- echo "#define DRIVER_VERSION \"SVN $(PKG_VERSION)\"" > "$(PKG_BUILD_DIR)/version.h"
- $(MAKE) -C $(LINUX_DIR) \
- ARCH="$(LINUX_KARCH)" \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- SUBDIRS="$(PKG_BUILD_DIR)" \
- modules
-endef
-
-$(eval $(call KernelPackage,video-uvc-obsolete))
View
44 multimedia/nw802-2.4/Makefile
@@ -1,44 +0,0 @@
-#
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=nw802-2.4
-PKG_VERSION:=0.0.99
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/nw802
-PKG_MD5SUM:=bf3512efaa48cfa972b16318011c1963
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/video-nw8xx
- SUBMENU:=Video Support
- TITLE:=NW8xx based USB webcam support
- URL:=http://nw802.sourceforge.net/
- DEPENDS:=@LINUX_2_6_25||LINUX_2_6_27||LINUX_2_6_28 @USB_SUPPORT +kmod-usb-video +kmod-video-core
- FILES:=$(PKG_BUILD_DIR)/nw8xx.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,70,nw8xx)
-endef
-
-define KernelPackage/video-nw8xx/description
- Kernel support for NW8xx based USB cameras.
-endef
-
-define Build/Compile
- ln -sf $(LINUX_DIR)/drivers/media/video/usbvideo/usbvideo.h \
- $(PKG_BUILD_DIR)/
- $(MAKE) -C $(LINUX_DIR) \
- ARCH="$(LINUX_KARCH)" \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- SUBDIRS="$(PKG_BUILD_DIR)" \
- modules
-endef
-
-$(eval $(call KernelPackage,video-nw8xx))
View
2,980 multimedia/nw802-2.4/patches/001-linux_2_6_cvs.patch
0 additions, 2,980 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
134 multimedia/nw802-2.4/patches/100-compile_fix.patch
@@ -1,134 +0,0 @@
---- a/nw8xx_jpgl.c
-+++ b/nw8xx_jpgl.c
-@@ -111,18 +111,18 @@
- // Clamping table
- #define SAFE_CLAMP
- #ifdef SAFE_CLAMP
--inline unsigned char clamp(int x) {
-+inline unsigned char nw8xx_clamp(int x) {
- if ( x > 255 )
- return 255;
- if ( x < 0 )
- return 0;
- return x;
- }
--#define clamp_adjust(x) clamp(x+128)
-+#define nw8xx_clamp_adjust(x) nw8xx_clamp(x+128)
- #else
--#define clamp(x) clampTbl[(x)+512]
--#define clamp_adjust(x) clampTbl[(x)+640]
--static char clampTbl[1280];
-+#define nw8xx_clamp(x) nw8xx_clampTbl[(x)+512]
-+#define nw8xx_clamp_adjust(x) nw8xx_clampTbl[(x)+640]
-+static char nw8xx_clampTbl[1280];
- #endif
-
- // Code to initialize those tables
-@@ -195,19 +195,19 @@
- }
-
- #ifndef SAFE_CLAMP
--static void clampTbl_init(void)
-+static void nw8xx_clampTbl_init(void)
- {
- // Instead of doing if(...) to test for overrange, we use
-- // a clamping table
-+ // a nw8xx_clamping table
-
- int i;
-
- for (i=0 ; i < 512 ; i++)
-- clampTbl[i] = 0;
-+ nw8xx_clampTbl[i] = 0;
- for (i=512 ; i < 768 ; i++ )
-- clampTbl[i] = i - 512;
-+ nw8xx_clampTbl[i] = i - 512;
- for (i=768 ; i < 1280 ; i++ )
-- clampTbl[i] = 255;
-+ nw8xx_clampTbl[i] = 255;
-
- }
- #endif
-@@ -521,16 +521,16 @@
- for ( x=0 ; x<4 ; x++ )
- {
- // Y block
-- Yline[ 0] = clamp_adjust(block_y[block_idx ]);
-- Yline[ 4] = clamp_adjust(block_y[block_idx+16]);
-- Yline[ 8] = clamp_adjust(block_y[block_idx+32]);
-- Yline[12] = clamp_adjust(block_y[block_idx+48]);
-+ Yline[ 0] = nw8xx_clamp_adjust(block_y[block_idx ]);
-+ Yline[ 4] = nw8xx_clamp_adjust(block_y[block_idx+16]);
-+ Yline[ 8] = nw8xx_clamp_adjust(block_y[block_idx+32]);
-+ Yline[12] = nw8xx_clamp_adjust(block_y[block_idx+48]);
-
- // U block
-- *Uline = clamp_adjust(block_u[block_idx]);
-+ *Uline = nw8xx_clamp_adjust(block_u[block_idx]);
-
- // V block
-- *Vline = clamp_adjust(block_v[block_idx]);
-+ *Vline = nw8xx_clamp_adjust(block_v[block_idx]);
-
- // Ajust pointers & index
- block_idx++;
-@@ -596,9 +596,9 @@
- vc = Vline[0];
-
- // B G R
-- *(fb++) = clamp(( yc + yuvTbl_v2[vc] ) >> 16);
-- *(fb++) = clamp(( yc - yuvTbl_u2[uc] - yuvTbl_v1[vc] ) >> 16);
-- *(fb++) = clamp(( yc + yuvTbl_u1[uc] ) >> 16);
-+ *(fb++) = nw8xx_clamp(( yc + yuvTbl_v2[vc] ) >> 16);
-+ *(fb++) = nw8xx_clamp(( yc - yuvTbl_u2[uc] - yuvTbl_v1[vc] ) >> 16);
-+ *(fb++) = nw8xx_clamp(( yc + yuvTbl_u1[uc] ) >> 16);
- #ifdef _JPGL_TEST_
- fb++;
- #endif
-@@ -609,9 +609,9 @@
- vc = ( 3*Vline[0] + Vline[1] ) >> 2;
-
- // B G R
-- *(fb++) = clamp(( yc + yuvTbl_v2[vc] ) >> 16);
-- *(fb++) = clamp(( yc - yuvTbl_u2[uc] - yuvTbl_v1[vc] ) >> 16);
-- *(fb++) = clamp(( yc + yuvTbl_u1[uc] ) >> 16);
-+ *(fb++) = nw8xx_clamp(( yc + yuvTbl_v2[vc] ) >> 16);
-+ *(fb++) = nw8xx_clamp(( yc - yuvTbl_u2[uc] - yuvTbl_v1[vc] ) >> 16);
-+ *(fb++) = nw8xx_clamp(( yc + yuvTbl_u1[uc] ) >> 16);
- #ifdef _JPGL_TEST_
- fb++;
- #endif
-@@ -622,9 +622,9 @@
- vc = ( Vline[0] + Vline[1] ) >> 1;
-
- // B G R
-- *(fb++) = clamp(( yc + yuvTbl_v2[vc] ) >> 16);
-- *(fb++) = clamp(( yc - yuvTbl_u2[uc] - yuvTbl_v1[vc] ) >> 16);
-- *(fb++) = clamp(( yc + yuvTbl_u1[uc] ) >> 16);
-+ *(fb++) = nw8xx_clamp(( yc + yuvTbl_v2[vc] ) >> 16);
-+ *(fb++) = nw8xx_clamp(( yc - yuvTbl_u2[uc] - yuvTbl_v1[vc] ) >> 16);
-+ *(fb++) = nw8xx_clamp(( yc + yuvTbl_u1[uc] ) >> 16);
- #ifdef _JPGL_TEST_
- fb++;
- #endif
-@@ -635,9 +635,9 @@
- vc = ( Vline[0] + 3*Vline[1] ) >> 2;
-
- // B G R
-- *(fb++) = clamp(( yc + yuvTbl_v2[vc] ) >> 16);
-- *(fb++) = clamp(( yc - yuvTbl_u2[uc] - yuvTbl_v1[vc] ) >> 16);
-- *(fb++) = clamp(( yc + yuvTbl_u1[uc] ) >> 16);
-+ *(fb++) = nw8xx_clamp(( yc + yuvTbl_v2[vc] ) >> 16);
-+ *(fb++) = nw8xx_clamp(( yc - yuvTbl_u2[uc] - yuvTbl_v1[vc] ) >> 16);
-+ *(fb++) = nw8xx_clamp(( yc + yuvTbl_u1[uc] ) >> 16);
- #ifdef _JPGL_TEST_
- fb++;
- #endif
-@@ -707,6 +707,6 @@
- vlcTbl_init();
- yuvTbl_init();
- #ifndef SAFE_CLAMP
-- clampTbl_init();
-+ nw8xx_clampTbl_init();
- #endif
- }
View
75 multimedia/ov51x-jpeg/Makefile
@@ -1,75 +0,0 @@
-#
-# Copyright (C) 2007-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ov51x-jpeg
-PKG_VERSION:=1.5.9
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.rastageeks.org/downloads/ov51x-jpeg/ \
- http://www.rastageeks.org/downloads/ov51x-jpeg/old-releases/
-PKG_MD5SUM:=95041de8e908f1548df3d4e1f6ed2a94
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ov51x-jpeg/Default
- URL:=http://www.rastageeks.org/ov51x-jpeg/
-endef
-
-define Package/ov51x-jpeg-utils
-$(call Package/ov51x-jpeg/Default)
- SECTION:=utils
- CATEGORY:=Utilities
- TITLE:=OV51x based USB webcam utilities
- DEPENDS:=+kmod-video-ov51x-jpeg
-endef
-
-define Package/ov51x-jpeg-utils/description
- Utility programs for the video-ov51x kernel module
-endef
-
-define KernelPackage/video-ov51x-jpeg
-$(call Package/ov51x-jpeg/Default)
- SUBMENU:=Video Support
- TITLE:=OV51x based USB webcam support (JPEG)
- DEPENDS:=@LINUX_2_6_25||LINUX_2_6_27||LINUX_2_6_28 @USB_SUPPORT +kmod-usb-core +kmod-video-core
- FILES:=$(PKG_BUILD_DIR)/ov51x-jpeg.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,70,ov51x-jpeg)
-endef
-
-define KernelPackage/video-ov51x-jpeg/description
- Kernel module for OV51x based USB cameras, with in-driver JPEG support.
-endef
-
-ifneq ($(CONFIG_PACKAGE_kmod-video-ov51x-jpeg),)
- define Build/Compile/kmod
- $(MAKE) -C $(LINUX_DIR) \
- ARCH="$(LINUX_KARCH)" \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- SUBDIRS="$(PKG_BUILD_DIR)" \
- modules
- endef
-endif
-
-define Build/Compile
- $(call Build/Compile/kmod)
- $(MAKE) -C $(PKG_BUILD_DIR)/test \
- CFLAGS="$(TARGET_CFLAGS)" \
- CC="$(TARGET_CC)" \
- getjpeg
-endef
-
-define Package/ov51x-jpeg-utils/install
- $(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/getjpeg $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,ov51x-jpeg-utils))
-$(eval $(call KernelPackage,video-ov51x-jpeg))
View
20 multimedia/ov51x-jpeg/patches/100-compile_fix.patch
@@ -1,20 +0,0 @@
---- a/ov51x-jpeg-core.c
-+++ b/ov51x-jpeg-core.c
-@@ -753,7 +753,7 @@
- * -claudio
- */
-
-- ov51x_jpeg_proc_entry = create_proc_entry("ov51x-jpeg", S_IFDIR, &proc_root);
-+ ov51x_jpeg_proc_entry = create_proc_entry("ov51x-jpeg", S_IFDIR, NULL);
- if (ov51x_jpeg_proc_entry)
- ov51x_jpeg_proc_entry->owner = THIS_MODULE;
- else
-@@ -771,7 +771,7 @@
-
- /* Destroy proc entry */
- PDEBUG(4, "destroying /proc/ov51x-jpeg");
-- remove_proc_entry("ov51x-jpeg", &proc_root);
-+ remove_proc_entry("ov51x-jpeg", NULL);
- ov51x_jpeg_proc_entry = NULL;
-
- }
View
91 multimedia/qc-usb/Makefile
@@ -1,91 +0,0 @@
-#
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=qc-usb
-PKG_VERSION:=0.6.6
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/qce-ga
-PKG_MD5SUM:=9eab8fb3a75326d1565d59b0c7256075
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/qc-usb/Default
- URL:=http://qce-ga.sourceforge.net/
-endef
-
-define Package/qc-usb-utils
-$(call Package/qc-usb/Default)
- SECTION:=utils
- CATEGORY:=Utilities
- TITLE:=Utility programs for the qc-usb kernel module
-endef
-
-define Package/qc-usb-utils/description
- Utilities to tweak parameters of your QuickCam Express or similar webcam.
- These programs are completely useless without a qc-usb-modules package.
-endef
-
-define KernelPackage/video-quickcam
-$(call Package/qc-usb/Default)
- SUBMENU:=Video Support
- TITLE:=QuickCam Express USB webcam support
- DEPENDS:=@USB_SUPPORT @LINUX_2_6_25||LINUX_2_6_27||LINUX_2_6_28 +kmod-usb-core +kmod-video-core
- FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,90,quickcam)
-endef
-
-define KernelPackage/video-quickcam/description
- Kernel support for Logitech's QuickCam Express webcam and other webcams
- with similar chipsets.
-endef
-
-ifeq ($(KERNEL),2.4)
- ifeq ($(LINUX_KARCH),i386)
- KERNEL_C_OPTS:= -Os -mpreferred-stack-boundary=2 -march=i486 -fno-unit-at-a-time
- endif
- ifeq ($(LINUX_KARCH),mips)
- KERNEL_C_OPTS:= -Os -G 0 -mlong-calls -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap
- endif
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-video-quickcam),)
- define Build/Compile/kmod
- $(MAKE) -C $(PKG_BUILD_DIR) \
- LINUX_DIR="$(LINUX_DIR)" \
- ARCH="$(LINUX_KARCH)" \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- CC="$(TARGET_CC)" \
- LD="$(TARGET_CC) -nodefaultlibs -lc -nostartfiles" \
- USER_OPT="$(KERNEL_C_OPTS)" \
- quickcam.$(LINUX_KMOD_SUFFIX)
- endef
-endif
-
-define Build/Compile/user
- $(MAKE) -C $(PKG_BUILD_DIR) \
- CC="$(TARGET_CC)" \
- CFLAGS="$(TARGET_CFLAGS)" \
- qcset
-endef
-
-define Build/Compile
- $(call Build/Compile/kmod)
- $(call Build/Compile/user)
-endef
-
-define Package/qc-usb-utils/install
- $(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/qcset $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,qc-usb-utils))
-$(eval $(call KernelPackage,video-quickcam))
View
44 multimedia/qc-usb/patches/001-linux_2_6.patch
@@ -1,44 +0,0 @@
---- a/qc-driver.c
-+++ b/qc-driver.c
-@@ -821,7 +821,9 @@ static int qc_i2c_init(struct quickcam *
- if (!cr) goto fail2;
- urb->transfer_buffer = kmalloc(qc_i2c_maxbufsize*sizeof(u8), GFP_KERNEL); /* Allocate maximum ever needed */
- if (!urb->transfer_buffer) goto fail3;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
- spin_lock_init(&urb->lock);
-+#endif
- urb->complete = qc_i2c_handler;
- urb->context = qc;
- #if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,9) && !defined(CONFIG_SUSE_KERNEL)) || LINUX_VERSION_CODE<KERNEL_VERSION(2,6,8)
-@@ -3006,7 +3008,9 @@ static struct file_operations qc_v4l_fop
- static struct video_device qc_v4l_template = {
- name: "QuickCam USB",
- type: VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
- hardware: VID_HARDWARE_QCAM_USB,
-+#endif
- minor: -1,
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- release: qc_v4l_release,
---- a/qc-memory.c
-+++ b/qc-memory.c
-@@ -78,15 +78,19 @@ static inline int qc_remap_page_range(un
- #endif
-
- #if LINUX_VERSION_CODE>=KERNEL_VERSION(2,5,3) || defined(pte_offset_map)
-+#ifndef pte_offset
- #define pte_offset(pmd,adr) pte_offset_map(pmd,adr) /* Emulation for a kernel using the new rmap-vm */
-+#endif
- #endif /* Fix by Michele Balistreri <brain87@gmx.net> */
-
-+#ifndef SETPAGEFLAG
- #ifndef SetPageReserved
- #define SetPageReserved(p) mem_map_reserve(p)
- #endif
- #ifndef ClearPageReserved
- #define ClearPageReserved(p) mem_map_unreserve(p)
- #endif
-+#endif /* SETPAGEFLAG */
- /* }}} */
-
- /* {{{ [fold] kvirt_to_pa(): obtain physical address from virtual address obtained by vmalloc() */
View
11 multimedia/qc-usb/patches/002-qc_set_cross_compile.patch
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -183,7 +183,7 @@ install: $(MODULE_NAME)
- -$(DEPMOD) -a
-
- qcset: qcset.c quickcam.h
-- gcc -Wall -O2 -s qcset.c -o qcset -lm
-+ $(CC) -Wall -O2 -s qcset.c -o qcset -lm
-
- .PHONY: patch
- patch: kernel-patch kernel-files
View
25 multimedia/qc-usb/patches/003-linux_2_6_27.patch
@@ -1,25 +0,0 @@
----
---- a/qc-driver.c
-+++ b/qc-driver.c
-@@ -2528,7 +2528,11 @@ static int qc_v4l_ioctl(struct video_dev
- if (qcdebug&QC_DEBUGUSER) PDEBUG("VIDIOCGCAP");
- memset(&b, 0, sizeof(b));
- strcpy(b.name, "Logitech QuickCam USB"); /* Max 31 characters */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+ b.type = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE;
-+#else
- b.type = qc->vdev.type;
-+#endif
- b.channels = 1;
- b.audios = 0;
- b.maxwidth = qc->sensor_data.maxwidth;
-@@ -3007,7 +3011,9 @@ static struct file_operations qc_v4l_fop
-
- static struct video_device qc_v4l_template = {
- name: "QuickCam USB",
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
- type: VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE,
-+#endif
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
- hardware: VID_HARDWARE_QCAM_USB,
- #endif
View
108 multimedia/qc-usb/patches/004-linux_2_6_28.patch
@@ -1,108 +0,0 @@
-The following upstream commit renders qc-usb FTBS:
-
-Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=601e9444f249d219009ec05674268d90f6f1cdcb
-Commit: 601e9444f249d219009ec05674268d90f6f1cdcb
-Parent: e138c592b50370621653fd962b2bc3f4e25dfe78
-Author: Hans Verkuil <hverkuil@xs4all.nl>
-AuthorDate: Sat Aug 23 07:24:07 2008 -0300
-Committer: Mauro Carvalho Chehab <mchehab@redhat.com>
-CommitDate: Sun Oct 12 09:36:54 2008 -0200
-
- V4L/DVB (8786): v4l2: remove the priv field, use dev_get_drvdata instead
-
- Remove the priv field and let video_get/set_drvdata use dev_get_drvdata
- and dev_set_drvdata instead.
-
- Convert all drivers that still used priv directly.
-
- Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
- Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-
-Copyright (C) 2008 Stefan Lippers-Hollmann <s.l-h@gmx.de>
-
---- a/qc-driver.c
-+++ b/qc-driver.c
-@@ -2255,7 +2255,11 @@ static unsigned int qc_v4l_poll(struct v
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- struct video_device *dev = video_devdata(file);
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
- struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
- struct qc_frame_data *fd = &qc->frame_data;
- int mask;
-
-@@ -2307,7 +2311,11 @@ static int qc_v4l_open(struct video_devi
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- struct video_device *dev = video_devdata(file);
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+ struct quickcam *qc = video_get_drvdata(dev);
-+#else
- struct quickcam *qc = dev->priv;
-+#endif
- int r;
-
- if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_open(qc=%p)", qc);
-@@ -2375,7 +2383,11 @@ static void qc_v4l_close(struct video_de
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- struct video_device *dev = video_devdata(file);
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
- struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
- if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_close(dev=%p,qc=%p)",dev,qc);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- TEST_BUGR_MSG(qc==NULL, "qc==NULL");
-@@ -2423,7 +2435,11 @@ static long qc_v4l_read(struct video_dev
- struct video_device *dev = video_devdata(file);
- int noblock = file->f_flags & O_NONBLOCK;
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
- struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
- int frame_len;
- unsigned char *frame;
- long r = 0;
-@@ -2478,7 +2494,11 @@ static int qc_v4l_mmap(
- const void *start = (void *)vma->vm_start;
- unsigned long size = vma->vm_end - vma->vm_start;
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
- struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
- unsigned char *frame;
- int ret = 0, frame_size;
- #if !HAVE_VMA && LINUX_VERSION_CODE<KERNEL_VERSION(2,6,0)
-@@ -2510,7 +2530,11 @@ static int qc_v4l_ioctl(struct video_dev
- struct video_device *dev = video_devdata(file);
- void *argp = (void *)arg;
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev);
-+#else
- struct quickcam *qc = (struct quickcam *)dev->priv;
-+#endif
- int i, retval = 0;
-
- if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_ioctl(dev=%p,cmd=%u,arg=%p,qc=%p)",dev,cmd,argp,qc);
-@@ -3165,7 +3189,11 @@ PDEBUG("poisoning qc in qc_usb_init");
-
- /* Register V4L video device */
- memcpy(&qc->vdev, &qc_v4l_template, sizeof(qc_v4l_template));
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+ video_set_drvdata(&qc->vdev, qc);
-+#else
- qc->vdev.priv = qc;
-+#endif
- r = video_register_device(&qc->vdev, VFL_TYPE_GRABBER, video_nr);
- if (r<0) goto fail3;
- PRINTK(KERN_INFO, "Registered device: /dev/video%i", qc->vdev.minor);
View
40 multimedia/spca5xx-le/Makefile
@@ -1,40 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=spca5xx-le
-PKG_VERSION:=1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME).tar.bz2
-PKG_SOURCE_URL:=http://www.acmesystems.it/download/owrt/
-PKG_MD5SUM:=
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/video-spca5xx-le
- SUBMENU:=Video Support
- TITLE:=SPCA5xx based USB webcam support (Light Edition)
- URL:=http://mxhaard.free.fr/
- DEPENDS:=@LINUX_2_6_23||LINUX_2_6_24||LINUX_2_6_25 @USB_SUPPORT +kmod-usb-core +kmod-video-core
- FILES:=$(PKG_BUILD_DIR)/spca5xx.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,90,spca5xx)
-endef
-
-define Build/Compile
- $(MAKE) -C $(LINUX_DIR) \
- ARCH="$(LINUX_KARCH)" \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- SUBDIRS="$(PKG_BUILD_DIR)" \
- modules
-endef
-
-$(eval $(call KernelPackage,video-spca5xx-le))
View
21 multimedia/spca5xx-le/patches/100-compile_pud_shift.patch
@@ -1,21 +0,0 @@
-diff -Naur spca5xx-le/spca_core.c spca5xx-le-new/spca_core.c
---- spca5xx-le/spca_core.c 2007-06-03 21:30:29.000000000 +0100
-+++ spca5xx-le-new/spca_core.c 2008-01-06 12:48:08.000000000 +0000
-@@ -535,7 +535,7 @@
-
- if (!pgd_none (*pgd))
- {
--#if PUD_SHIFT
-+#ifdef PUD_SHIFT
- pud_t *pud = pud_offset (pgd, adr);
- if (!pud_none (*pud))
- {
-@@ -552,7 +552,7 @@
- ret = (unsigned long) page_address (pte_page (pte));
- ret |= (adr & (PAGE_SIZE - 1));
- }
--#if PUD_SHIFT
-+#ifdef PUD_SHIFT
- }
- #endif
- }
View
13 multimedia/spca5xx-le/patches/101-linux_2_6.patch
@@ -1,13 +0,0 @@
-diff -ruN spca5xx-le-orig/spca_core.c spca5xx-le/spca_core.c
---- spca5xx-le-orig/spca_core.c 2008-04-12 18:09:57.000000000 +0200
-+++ spca5xx-le/spca_core.c 2008-04-12 18:16:45.000000000 +0200
-@@ -2799,7 +2799,9 @@
- .owner = THIS_MODULE,
- .name = "SPCA5XX USB Camera",
- .type = VID_TYPE_CAPTURE,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
- .hardware = VID_HARDWARE_SPCA5XX,
-+#endif
- .fops = &spca5xx_fops,
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
- .release = video_device_release,
View
54 multimedia/spca5xx-view/Makefile
@@ -1,54 +0,0 @@
-#
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=spca5xx-view
-PKG_VERSION:=1
-PKG_RELEASE:=3
-
-PKG_SOURCE:=spca5xx-view.tar.bz2
-PKG_SOURCE_URL:=http://www.acmesystems.it/download/owrt
-PKG_MD5SUM:=113357f8fbc3b994424ae37644529d55
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/spca5xx-view
- SECTION:=utils
- CATEGORY:=Utilities
- TITLE:=spca5xx streaming applicaton
- DEPENDS:=+kmod-video-spca5xx-le +libpthread
- URL:=http://www.acmesystems.it/
-endef
-
-define Package/spca5xx-view/description
- This package contains a streaming daemon for spca5xx based webcams
-endef
-
-define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR)/servfox/ CFLAGS="$(TARTGET_CFLAGS)" CC="$(TARGET_CC)" all
- $(MAKE) -C $(PKG_BUILD_DIR)/servfox/ PREFIX="$(PKG_INSTALL_DIR)" install
-endef
-
-define Package/spca5xx-view/install
- $(INSTALL_DIR) $(1)/
- $(CP) $(PKG_INSTALL_DIR)/* $(1)
- $(INSTALL_DIR) $(1)/www/
- $(CP) $(PKG_BUILD_DIR)/html-files/* $(1)/www/
- $(INSTALL_DIR) $(1)/etc/config
- $(INSTALL_DATA) ./files/servfox.config $(1)/etc/config/servfox
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) ./files/servfox.init $(1)/etc/init.d/servfox
-endef
-
-define Package/spca5xx-view/conffiles
-/etc/config/servfox
-endef
-
-$(eval $(call BuildPackage,spca5xx-view))
View
4 multimedia/spca5xx-view/files/servfox.config
@@ -1,4 +0,0 @@
-config servfox
- option device '/dev/video0'
- option port '7070'
- option resolution '640x480'
View
25 multimedia/spca5xx-view/files/servfox.init
@@ -1,25 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
-
-START=90
-
-satrt_instance() {
- local cfg="$1"
- local res
- local dev
- local port
-
- config_get res "$cfg" 'resolution'
- config_get dev "$cfg" 'device'
- config_get port "$cfg" 'port'
- service_start bin/servfox ${dev:+-d $dev} ${res:+-s $res} ${port:+-w $port}
-}
-
-start() {
- config_load 'servfox'
- config_foreach start_instance 'servfox'
-}
-
-stop() {
- service_stop /bin/servfox
-}
View
2 net/dsl-qos-queue/Makefile
@@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/dsl-qos-queue
SECTION:=net
CATEGORY:=Network
- DEPENDS:=+iptables +kmod-ipt-queue +iptables-mod-ipopt +libipq @!LINUX_2_6_25 @!LINUX_2_6_26 @!LINUX_2_6_27 @!LINUX_2_6_28
+ DEPENDS:=+iptables +kmod-ipt-queue +iptables-mod-ipopt +libipq
TITLE:=ADSL/ATM Bandwith management
URL:=http://www.sonicspike.net/software/
endef
View
58 net/et131x/Makefile
@@ -1,58 +0,0 @@
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=et131x
-ifdef CONFIG_LINUX_2_6_25
- PKG_VERSION:=1.2.3-3
- PKG_RELEASE:=1
-
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
- PKG_SOURCE_URL:=@SF/et131x
- PKG_MD5SUM:=9496422c7d218f27bae1be42a04d122e
-endif
-
-include $(INCLUDE_DIR)/package.mk
-
-ifdef CONFIG_LINUX_2_6_25
- MODULE:=$(PKG_BUILD_DIR)/et131x.$(LINUX_KMOD_SUFFIX)
- KMOD_BUILD_DIR=$(PKG_BUILD_DIR)
-else
- MODULE:=$(LINUX_DIR)/drivers/staging/et131x/et131x.$(LINUX_KMOD_SUFFIX)
- KMOD_BUILD_DIR=$(LINUX_DIR)/drivers/staging/et131x
-endif
-
-define KernelPackage/et131x
- SUBMENU:=Network Devices
- TITLE:=Agere ET131x Gigabit Ethernet driver
- URL:=http://sourceforge.net/projects/et131x
- FILES:=$(MODULE)
- KCONFIG:= \
- CONFIG_ET131X=m \
- CONFIG_ET131X_DEBUG=n
- DEPENDS:=@PCI_SUPPORT
- AUTOLOAD:=$(call AutoLoad,70,et131x)
-endef
-
-define KernelPackage/et131x/description
- This package contains the et131x kernel module.
-endef
-
-ifndef CONFIG_LINUX_2_6_25
- define Build/Prepare
- # nothing to do
- endef
- define Build/Configure
- # nothing to do
- endef
-endif
-
-define Build/Compile
- $(MAKE) -C "$(LINUX_DIR)" \
- ARCH="$(LINUX_KARCH)" \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- SUBDIRS="$(KMOD_BUILD_DIR)" \
- CONFIG_ET131X=m
-endef
-
-$(eval $(call KernelPackage,et131x))
-
View
6 net/fwknop/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2011 OpenWrt.org
+# Copyright (C) 2011-2012 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fwknop
-PKG_VERSION:=2.0.0rc4
+PKG_VERSION:=2.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.cipherdyne.org/fwknop/download
-PKG_MD5SUM:=4f5d45187429ca56d3b444ab96c57fb6
+PKG_MD5SUM:=96de4c5a4ae75a8618ef80269c6a70ad
PKG_INSTALL:=1
View
4 net/fwknop/patches/001-fix_config.patch
@@ -1,6 +1,6 @@
--- a/server/fwknopd.conf
+++ b/server/fwknopd.conf
-@@ -30,7 +30,12 @@
+@@ -29,7 +29,12 @@
# Define the ethernet interface on which we will sniff packets.
# Default if not set is eth0.
#
@@ -14,7 +14,7 @@
# By default fwknopd does not put the pcap interface into promiscuous mode.
# Set this to 'Y' to enable promiscuous sniffing.
-@@ -239,8 +244,13 @@
+@@ -252,8 +257,13 @@
# The IPT_FORWARD_ACCESS variable is only used if ENABLE_IPT_FORWARDING is
# enabled.
#
View
17 net/fwknop/patches/002-fix_init.patch
@@ -0,0 +1,17 @@
+--- a/extras/openwrt/package/fwknop/files/fwknopd.init
++++ b/extras/openwrt/package/fwknop/files/fwknopd.init
+@@ -8,12 +8,12 @@ FWKNOPD_BIN=/usr/sbin/fwknopd
+
+ start()
+ {
+- $FWKNOPD_BIN
++ service_start $FWKNOPD_BIN
+ }
+
+ stop()
+ {
+- $FWKNOPD_BIN -K
++ service_stop $FWKNOPD_BIN -K
+ }
+
+ restart()
View
34 net/socat/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=socat
-PKG_VERSION:=1.7.1.3
-PKG_RELEASE:=2
+PKG_VERSION:=1.7.2.1
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download/
-PKG_MD5SUM:=2081987fb0cb0290b8105574058cb329
+PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download
+PKG_MD5SUM:=7ddfea7e9e85f868670f94d3ea08358b
PKG_INSTALL:=1
@@ -36,19 +36,17 @@ define Package/socat/description
many more options.
endef
-define Build/Configure
- $(call Build/Configure/Default, \
- --disable-libwrap \
- --disable-readline \
- --disable-openssl \
- --enable-termios \
- , \
- sc_cv_termios_ispeed="no" \
- sc_cv_sys_crdly_shift=9 \
- sc_cv_sys_tabdly_shift=11 \
- sc_cv_sys_csize_shift=4 \
- )
-endef
+CONFIGURE_ARGS += \
+ --disable-libwrap \
+ --disable-readline \
+ --disable-openssl \
+ --enable-termios
+
+CONFIGURE_VARS += \
+ sc_cv_termios_ispeed="no" \
+ sc_cv_sys_crdly_shift=9 \
+ sc_cv_sys_tabdly_shift=11 \
+ sc_cv_sys_csize_shift=4
define Package/socat/install
$(INSTALL_DIR) $(1)/usr/bin
View
2 net/socat/patches/501-honor_ldflags.patch
@@ -1,6 +1,6 @@
--- a/Makefile.in
+++ b/Makefile.in
-@@ -37,7 +37,8 @@
+@@ -38,7 +38,8 @@ INSTALL = @INSTALL@
#0 CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS)
CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(CPPFLAGS)
View
48 net/socat/patches/502-no_sslv2.patch
@@ -1,48 +0,0 @@
---- a/sslcls.c
-+++ b/sslcls.c
-@@ -35,6 +35,7 @@
- return result;
- }
-
-+#ifndef OPENSSL_NO_SSL2
- SSL_METHOD *sycSSLv2_client_method(void) {
- SSL_METHOD *result;
- Debug("SSLv2_client_method()");
-@@ -50,6 +51,7 @@
- Debug1("SSLv2_server_method() -> %p", result);
- return result;
- }
-+#endif
-
- SSL_METHOD *sycSSLv3_client_method(void) {
- SSL_METHOD *result;
---- a/xio-openssl.c
-+++ b/xio-openssl.c
-@@ -676,9 +676,12 @@
-
- if (!server) {
- if (me_str != 0) {
-+#ifndef OPENSSL_NO_SSL2
- if (!strcasecmp(me_str, "SSLv2") || !strcasecmp(me_str, "SSL2")) {
- method = sycSSLv2_client_method();
-- } else if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str, "SSL3")) {
-+ } else
-+#endif
-+ if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str, "SSL3")) {
- method = sycSSLv3_client_method();
- } else if (!strcasecmp(me_str, "SSLv23") || !strcasecmp(me_str, "SSL23") ||
- !strcasecmp(me_str, "SSL")) {
-@@ -695,9 +698,12 @@
- }
- } else /* server */ {
- if (me_str != 0) {
-+#ifndef OPENSSL_NO_SSL2
- if (!strcasecmp(me_str, "SSLv2") || !strcasecmp(me_str, "SSL2")) {
- method = sycSSLv2_server_method();
-- } else if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str, "SSL3")) {
-+ } else
-+#endif
-+ if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str, "SSL3")) {
- method = sycSSLv3_server_method();
- } else if (!strcasecmp(me_str, "SSLv23") || !strcasecmp(me_str, "SSL23") ||
- !strcasecmp(me_str, "SSL")) {
View
4 net/transmission/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=transmission
-PKG_VERSION:=2.51
+PKG_VERSION:=2.52
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://mirrors.m0k.org/transmission/files
-PKG_MD5SUM:=dfe2faeb2b76b43954ec943affef2133
+PKG_MD5SUM:=9490ed97a03f7b8b1ac8b0822c3dce92
PKG_FIXUP:=libtool
PKG_INSTALL:=1
View
4 utils/bluelog/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=bluelog
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.3
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.digifail.com/downloads/software/bluelog
-PKG_MD5SUM:=f406d47ec94970be219cbb38f49402f9
+PKG_MD5SUM:=cbbb5a7d04ac7160f3f7389e05cd4257
PKG_INSTALL:=1
View
6 utils/gnupg/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gnupg
-PKG_VERSION:=1.4.11
+PKG_VERSION:=1.4.12
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg \
ftp://ftp.gnupg.org/gcrypt/gnupg
-PKG_MD5SUM:=411744e1ef8ce90b87938c4203f001f1
+PKG_MD5SUM:=ce3742e5c7912559cab7894ad8ba7f6b
PKG_INSTALL:=1
View
86 utils/gnupg/patches/001-mips_gcc4.4.patch
@@ -1,86 +0,0 @@
---- a/mpi/longlong.h
-+++ b/mpi/longlong.h
-@@ -710,12 +710,13 @@ extern USItype __udiv_qrnnd ();
- ************** MIPS *****************
- ***************************************/
- #if defined (__mips__) && W_TYPE_SIZE == 32
--#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR >= 4 )
--#define umul_ppmm(w1, w0, u, v) \
-+#if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+#define umul_ppmm(w1, w0, u, v) \
- do { \
-- UDItype __ll = (UDItype)(u) * (v); \
-- w1 = __ll >> 32; \
-- w0 = __ll; \
-+ UDItype _r; \
-+ _r = (UDItype) u * v; \
-+ (w1) = _r >> 32; \
-+ (w0) = (USItype) _r; \
- } while (0)
- #elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-@@ -727,8 +728,8 @@ extern USItype __udiv_qrnnd ();
- #else
- #define umul_ppmm(w1, w0, u, v) \
- __asm__ ("multu %2,%3 \n" \
-- "mflo %0 \n" \
-- "mfhi %1" \
-+ "mflo %0 \n" \
-+ "mfhi %1" \
- : "=d" ((USItype)(w0)), \
- "=d" ((USItype)(w1)) \
- : "d" ((USItype)(u)), \
-@@ -742,25 +743,34 @@ extern USItype __udiv_qrnnd ();
- ************** MIPS/64 **************
- ***************************************/
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
--#define umul_ppmm(w1, w0, u, v) \
-- __asm__ ("dmultu %2,%3" \
-- : "=l" ((UDItype)(w0)), \
-- "=h" ((UDItype)(w1)) \
-- : "d" ((UDItype)(u)), \
-- "d" ((UDItype)(v)))
--#else
--#define umul_ppmm(w1, w0, u, v) \
-- __asm__ ("dmultu %2,%3 \n" \
-- "mflo %0 \n" \
-- "mfhi %1" \
-- : "=d" ((UDItype)(w0)), \
-- "=d" ((UDItype)(w1)) \
-- : "d" ((UDItype)(u)), \
-- "d" ((UDItype)(v)))
--#endif
--#define UMUL_TIME 20
--#define UDIV_TIME 140
-+# if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+ typedef unsigned int UTItype __attribute__ ((mode (TI)));
-+# define umul_ppmm(w1, w0, u, v) \
-+ do { \
-+ UTItype _r; \
-+ _r = (UTItype) u * v; \
-+ (w1) = _r >> 64; \
-+ (w0) = (UDItype) _r; \
-+ } while (0)
-+# elif if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+# define umul_ppmm(w1, w0, u, v) \
-+ __asm__ ("dmultu %2,%3" \
-+ : "=l" ((UDItype)(w0)), \
-+ "=h" ((UDItype)(w1)) \
-+ : "d" ((UDItype)(u)), \
-+ "d" ((UDItype)(v)))
-+# else
-+# define umul_ppmm(w1, w0, u, v) \
-+ __asm__ ("dmultu %2,%3 \n" \
-+ "mflo %0 \n" \
-+ "mfhi %1" \
-+ : "=d" ((UDItype)(w0)), \
-+ "=d" ((UDItype)(w1)) \
-+ : "d" ((UDItype)(u)), \
-+ "d" ((UDItype)(v)))
-+# endif
-+# define UMUL_TIME 20
-+# define UDIV_TIME 140
- #endif /* __mips__ */
-
-
View
4 utils/oww/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=oww
-PKG_VERSION:=0.86.0
+PKG_VERSION:=0.86.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/oww
-PKG_MD5SUM:=a4f6a93a959dd6390524f4394b064ae3
+PKG_MD5SUM:=8e51ffcd6008c9dc8a03a1a65f80092e
PKG_BUILD_DEPENDS:=intltool/host
PKG_INSTALL:=1
View
13 utils/strace/Makefile
@@ -10,16 +10,9 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=strace
-ifeq ($(CONFIG_LINUX_2_6_25),y)
- PKG_VERSION:=4.5.16
- PKG_RELEASE:=3
- PKG_MD5SUM:=77f66d09aa82981bb6d65fa19a2c1ba9
- PATCH_DIR:=patches-4.5.16
-else
- PKG_VERSION:=4.5.20
- PKG_RELEASE:=1
- PKG_MD5SUM:=64dfe10d9db0c1e34030891695ffca4b
-endif
+PKG_VERSION:=4.5.20
+PKG_RELEASE:=1
+PKG_MD5SUM:=64dfe10d9db0c1e34030891695ffca4b
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/$(PKG_NAME)

No commit comments for this range

Something went wrong with that request. Please try again.