From: John Crispin Date: Wed, 11 Mar 2015 16:01:24 +0000 (+0000) Subject: clean packages already moved to github X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e48bdac71d3ef660eb8abbca31e4b845182efc11;p=openwrt%2Fsvn-archive%2Fpackages.git clean packages already moved to github Remove duplicate packages that can cause build issues when oldpackages feed is enabled: apcupsd watchcat less dosfstools l7-protocols fakeidentd libshout ices libmicrohttpd libmicroxml python-mysql Signed-off-by: Mantas Pucka SVN-Revision: 44667 --- diff --git a/lang/pymysql/Makefile b/lang/pymysql/Makefile deleted file mode 100644 index 4669591b9..000000000 --- a/lang/pymysql/Makefile +++ /dev/null @@ -1,51 +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 - -PKG_NAME:=MySQL-python -PKG_VERSION:=1.2.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/mysql-python -PKG_MD5SUM:=532268f02870bea18c1d465e88afff30 - -PKG_BUILD_DEPENDS:=python - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, python-package.mk) - -define Package/python-mysql - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - TITLE:=MySQL database adapter for Python - URL:=http://mysql-python.sourceforge.net/ - DEPENDS:=+python +libmysqlclient -endef - -define Package/python-mysql/description - MySQLdb is an thread-compatible interface to the popular MySQL database - server that provides the Python database API. -endef - -define PyPackage/python-mysql/filespec -+|$(PYTHON_PKG_DIR)/_mysql.so -+|$(PYTHON_PKG_DIR)/_mysql_exceptions.py* -+|$(PYTHON_PKG_DIR)/MySQLdb -endef - -define Build/Compile - $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false) - $(call Build/Compile/PyMod,., \ - install --prefix="$(PKG_INSTALL_DIR)/usr", \ - ) -endef - -$(eval $(call PyPackage,python-mysql)) -$(eval $(call BuildPackage,python-mysql)) diff --git a/lang/pymysql/patches/000-setup.patch b/lang/pymysql/patches/000-setup.patch deleted file mode 100644 index e04e2f95e..000000000 --- a/lang/pymysql/patches/000-setup.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- MySQL-python-1.2.2/setup.py 2007-02-25 04:37:12.000000000 +0100 -+++ MySQL-python-1.2.2/setup.py 2007-08-15 12:23:18.000000000 +0200 -@@ -2,8 +2,7 @@ - - import os - import sys --import ez_setup; ez_setup.use_setuptools() --from setuptools import setup, Extension -+from distutils.core import setup, Extension - - if sys.version_info < (2, 3): - raise Error, "Python-2.3 or newer is required" diff --git a/lang/pymysql/patches/010-threadsafe.patch b/lang/pymysql/patches/010-threadsafe.patch deleted file mode 100644 index bcd9af8d6..000000000 --- a/lang/pymysql/patches/010-threadsafe.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- MySQL-python-1.2.2/site_orig.cfg 2007-08-15 12:58:40.000000000 +0200 -+++ MySQL-python-1.2.2/site.cfg 2007-08-15 12:58:49.000000000 +0200 -@@ -4,7 +4,7 @@ - # static: link against a static library (probably required for embedded) - - embedded = False --threadsafe = True -+threadsafe = False - static = False - - # The path to mysql_config. diff --git a/libs/libmicrohttpd/Makefile b/libs/libmicrohttpd/Makefile deleted file mode 100644 index 1f9f9d6b3..000000000 --- a/libs/libmicrohttpd/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (C) 2011-2012 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:=libmicrohttpd -PKG_VERSION:=0.9.19 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@GNU/libmicrohttpd -PKG_MD5SUM:=0f4c55ba224ce75b3b993b558e072a6b - -PKG_FIXUP:=autoreconf -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libmicrohttpd - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Microhttpd - URL:=http://www.gnu.org/software/libmicrohttpd - DEPENDS:=+libpthread -endef - -define Package/libmicrohttpd/description - GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application. -endef - -CONFIGURE_ARGS+= \ - --disable-curl \ - --disable-https \ - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/microhttpd.h $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.{a,so*} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmicrohttpd.pc $(1)/usr/lib/pkgconfig/ -endef - -define Package/libmicrohttpd/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libmicrohttpd)) diff --git a/libs/libmicroxml/Makefile b/libs/libmicroxml/Makefile deleted file mode 100644 index 559cc75d6..000000000 --- a/libs/libmicroxml/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (C) 2012 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:=libmicroxml -PKG_VERSION:=2012-06-11 -PKG_RELEASE=$(PKG_SOURCE_VERSION) - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://dev.freecwmp.org/microxml -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=72965423184f24cc0b963d91c2d1863cdb01b6aa -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz - -PKG_FIXUP:=autoreconf - -include $(INCLUDE_DIR)/package.mk - -define Package/libmicroxml - SECTION:=libs - CATEGORY:=Libraries - TITLE:=XML library -endef - -define Package/libmicroxml/description - A micro sized XML library -endef - -CONFIGURE_ARGS += \ - --disable-threads \ - --enable-static \ - --enable-shared - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_BUILD_DIR)/microxml.h $(1)/usr/include - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_BUILD_DIR)/microxml.pc $(1)/usr/lib/pkgconfig -endef - -define Package/libmicroxml/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib -endef - -$(eval $(call BuildPackage,libmicroxml)) diff --git a/libs/libshout/Makefile b/libs/libshout/Makefile deleted file mode 100644 index af12afad4..000000000 --- a/libs/libshout/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (C) 2008-2010 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:=libshout -PKG_VERSION:=2.3.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/libshout/ -PKG_MD5SUM:=11765b2592e7ea623ccd93d3f8df172c - -PKG_FIXUP:=autoreconf -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -TARGET_CFLAGS += $(FPIC) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Package/libshout - SECTION:=libs - DEPENDS:= +libspeex +libtheora +libvorbis +libvorbisidec +libpthread - CATEGORY:=Libraries - TITLE:=Library which can be used to write a source client like ices - URL:=http://www.icecast.org/download.php -endef - -define Package/libshout/description - libshout allows applications to easily communicate and broadcast - to an Icecast streaming media server. It handles the socket connections, - metadata communication, and data streaming for the calling application, - and lets developers focus on feature sets instead of implementation - details. -endef - -define Build/Configure - $(call Build/Configure/Default, \ - VORBIS_CFLAGS="-I$(STAGING_DIR)/usr/include/tremor/" \ - VORBIS_LIBS="$(TARGET_LDFLAGS) -lvorbis -lvorbisidec" \ - --enable-shared \ - --enable-static \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/shout - $(CP) $(PKG_INSTALL_DIR)/usr/include/shout/shout.h $(1)/usr/include/shout - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libshout.{a,so*} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(SED) 's|/usr/include|$(STAGING_DIR)/usr/include|' \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shout.pc - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shout.pc $(1)/usr/lib/pkgconfig/ -endef - -define Package/libshout/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libshout.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libshout)) diff --git a/libs/libshout/patches/120-vorbis-c.patch b/libs/libshout/patches/120-vorbis-c.patch deleted file mode 100644 index a9e41f93a..000000000 --- a/libs/libshout/patches/120-vorbis-c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/vorbis.c -+++ b/src/vorbis.c -@@ -28,7 +28,7 @@ - #endif - #include - --#include -+#include - - #include "shout_private.h" - #include "shout_ogg.h" diff --git a/libs/libshout/patches/140-no_example_doc_win32.patch b/libs/libshout/patches/140-no_example_doc_win32.patch deleted file mode 100644 index 9e8b5a357..000000000 --- a/libs/libshout/patches/140-no_example_doc_win32.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -288,12 +288,12 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.6 foreign - ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = include src examples debian doc win32 -+SUBDIRS = include src debian - EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \ - m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \ - m4/xiph_types.m4 - --doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c -+doc_DATA = COPYING NEWS README - m4datadir = $(datadir)/aclocal - m4data_DATA = m4/shout.m4 - @HAVE_PKGCONFIG_TRUE@pkgconfigdir = $(libdir)/pkgconfig diff --git a/net/apcupsd/Makefile b/net/apcupsd/Makefile deleted file mode 100644 index 8816a7a1e..000000000 --- a/net/apcupsd/Makefile +++ /dev/null @@ -1,74 +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:=apcupsd -PKG_VERSION:=3.14.7 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/apcupsd -PKG_MD5SUM:=bb2f8e4fc6b2f5d7b3e236eb57b81640 - -include $(INCLUDE_DIR)/package.mk - -define Package/apcupsd - SECTION:=utils - CATEGORY:=Utilities - DEPENDS:=+libpthread +libusb-compat - TITLE:=UPS control software - URL:=http://www.apcupsd.org/ -endef - -define Build/Configure - $(CP) $(SCRIPT_DIR)/config.* $(PKG_BUILD_DIR)/autoconf/ - $(call Build/Configure/Default, \ - --with-distname=unknown \ - --sysconfdir=/etc/apcupsd \ - --enable-usb \ - --without-x \ - ) -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - LD="$(TARGET_CC)" \ - all install -endef - -define Package/apcupsd/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/apcupsd $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/smtp $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/apctest $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/apcaccess $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/etc/apcupsd - $(INSTALL_CONF) ./files/apcupsd.conf $(1)/etc/apcupsd/ - $(INSTALL_CONF) ./files/apcupsd_mail.conf $(1)/etc/apcupsd/ - $(INSTALL_BIN) ./files/changeme $(1)/etc/apcupsd/ - $(INSTALL_BIN) ./files/commfailure $(1)/etc/apcupsd/ - $(INSTALL_BIN) ./files/commok $(1)/etc/apcupsd/ - $(INSTALL_BIN) ./files/offbattery $(1)/etc/apcupsd/ - $(INSTALL_BIN) ./files/onbattery $(1)/etc/apcupsd/ - $(INSTALL_BIN) ./files/apccontrol $(1)/etc/apcupsd/ - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/apcupsd.init $(1)/etc/init.d/apcupsd -endef - -define Package/apcupsd/conffiles -/etc/apcupsd/apcupsd.conf -/etc/apcupsd/apcupsd_mail.conf -/etc/apcupsd/changeme -/etc/apcupsd/commfailure -/etc/apcupsd/commok -/etc/apcupsd/offbattery -/etc/apcupsd/onbattery -endef - -$(eval $(call BuildPackage,apcupsd)) diff --git a/net/apcupsd/files/apccontrol b/net/apcupsd/files/apccontrol deleted file mode 100644 index 254935418..000000000 --- a/net/apcupsd/files/apccontrol +++ /dev/null @@ -1,146 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 1999-2002 Riccardo Facchetti -# -# for apcupsd release 3.14.1 (04 May 2007) - unknown -# -# platforms/apccontrol. Generated from apccontrol.in by configure. -# -# Note, this is a generic file that can be used by most -# systems. If a particular system needs to have something -# special, start with this file, and put a copy in the -# platform subdirectory. -# - -# -# These variables are needed for set up the autoconf other variables. -# -prefix=/usr -exec_prefix=/usr - -APCPID=/var/run/apcupsd.pid -APCUPSD=/usr/sbin/apcupsd -SHUTDOWN=/sbin/shutdown -SCRIPTSHELL=/bin/sh -SCRIPTDIR=/etc/apcupsd -WALL=true - -# -# Concatenate all output from this script to the events file -# Note, the following kills the script in a power fail situation -# where the disks are mounted read-only. -# exec >>/var/log/apcupsd.events 2>&1 - -# -# This piece is to substitute the default behaviour with your own script, -# perl, or C program. -# You can customize every single command creating an executable file (may be a -# script or a compiled program) and calling it the same as the $1 parameter -# passed by apcupsd to this script. -# -# After executing your script, apccontrol continues with the default action. -# If you do not want apccontrol to continue, exit your script with exit -# code 99. E.g. "exit 99". -# -# WARNING: the apccontrol file will be overwritten every time you update your -# apcupsd, doing `make install'. Your own customized scripts will _not_ be -# overwritten. If you wish to make changes to this file (discouraged), you -# should change apccontrol.sh.in and then rerun the configure process. -# -if [ -f ${SCRIPTDIR}/${1} -a -x ${SCRIPTDIR}/${1} ] -then - ${SCRIPTDIR}/${1} ${2} ${3} ${4} - # exit code 99 means he does not want us to do default action - if [ $? = 99 ] ; then - exit 0 - fi -fi - -case "$1" in - killpower) - echo "Apccontrol doing: ${APCUPSD} --killpower on UPS ${2}" - sleep 10 - ${APCUPSD} --killpower - echo "Apccontrol has done: ${APCUPSD} --killpower on UPS ${2}" | ${WALL} - ;; - commfailure) - echo "Warning communications lost with UPS ${2}" | ${WALL} - ;; - commok) - echo "Communications restored with UPS ${2}" | ${WALL} - ;; -# -# powerout, onbattery, offbattery, mainsback events occur -# in that order. -# - powerout) - echo "Warning power loss detected on UPS ${2}" | ${WALL} - ;; - onbattery) - echo "Power failure on UPS ${2}. Running on batteries." | ${WALL} - ;; - offbattery) - ;; - mainsback) - echo "Power has returned on UPS ${2}..." | ${WALL} - if [ -f /etc/powerfail ] ; then - printf "Continuing with shutdown." | ${WALL} - fi - ;; - failing) - echo "Battery power exhaused on UPS ${2}. Doing shutdown." | ${WALL} - ;; - timeout) - echo "Battery time limit exceeded on UPS ${2}. Doing shutdown." | ${WALL} - ;; - loadlimit) - echo "Remaining battery charge below limit on UPS ${2}. Doing shutdown." | ${WALL} - ;; - runlimit) - echo "Remaining battery runtime below limit on UPS ${2}. Doing shutdown." | ${WALL} - ;; - doreboot) - echo "UPS ${2} initiating Reboot Sequence" | ${WALL} - ${SHUTDOWN} -r now "apcupsd UPS ${2} initiated reboot" - ;; - doshutdown) - echo "UPS ${2} initiated Shutdown Sequence" | ${WALL} - ${SHUTDOWN} -h now "apcupsd UPS ${2} initiated shutdown" - ;; - annoyme) - echo "Power problems with UPS ${2}. Please logoff." | ${WALL} - ;; - emergency) - echo "Emergency Shutdown. Possible battery failure on UPS ${2}." | ${WALL} - ;; - changeme) - echo "Emergency! Batteries have failed on UPS ${2}. Change them NOW" | ${WALL} - ;; - remotedown) - echo "Remote Shutdown. Beginning Shutdown Sequence." | ${WALL} - ;; - restartme) - echo -n "Restarting APCUPSD Power Management: " - THEPID=`cat ${APCPID}` - kill ${THEPID} - rm -f ${APCPID} - rm -f /etc/powerfail - rm -f /etc/nologin - sleep 5 - `${APCUPSD}` - echo "apcupsd" - ;; - startselftest) - ;; - endselftest) - ;; - battdetach) - ;; - battattach) - ;; - *) echo "Usage: ${0##*/} command" - echo " warning: this script is intended to be launched by" - echo " apcupsd and should never be launched by users." - exit 1 - ;; -esac diff --git a/net/apcupsd/files/apcupsd.conf b/net/apcupsd/files/apcupsd.conf deleted file mode 100644 index b9acd61d6..000000000 --- a/net/apcupsd/files/apcupsd.conf +++ /dev/null @@ -1,322 +0,0 @@ -## apcupsd.conf v1.1 ## -# -# for apcupsd release 3.14.1 (04 May 2007) - unknown -# -# "apcupsd" POSIX config file - -# -# ========= General configuration parameters ============ -# - -# UPSNAME xxx -# Use this to give your UPS a name in log files and such. This -# is particulary useful if you have multiple UPSes. This does not -# set the EEPROM. It should be 8 characters or less. -UPSNAME ups1 - -# UPSCABLE -# Defines the type of cable connecting the UPS to your computer. -# -# Possible generic choices for are: -# simple, smart, ether, usb -# -# Or a specific cable model number may be used: -# 940-0119A, 940-0127A, 940-0128A, 940-0020B, -# 940-0020C, 940-0023A, 940-0024B, 940-0024C, -# 940-1524C, 940-0024G, 940-0095A, 940-0095B, -# 940-0095C, M-04-02-2000 -# -UPSCABLE smart - -# To get apcupsd to work, in addition to defining the cable -# above, you must also define a UPSTYPE, which corresponds to -# the type of UPS you have (see the Description for more details). -# You must also specify a DEVICE, sometimes referred to as a port. -# For USB UPSes, please leave the DEVICE directive blank. For -# other UPS types, you must specify an appropriate port or address. -# -# UPSTYPE DEVICE Description -# apcsmart /dev/tty** Newer serial character device, -# appropriate for SmartUPS models using -# a serial cable (not USB). -# -# usb Most new UPSes are USB. A blank DEVICE -# setting enables autodetection, which is -# the best choice for most installations. -# -# net hostname:port Network link to a master apcupsd -# through apcupsd's Network Information -# Server. This is used if you don't have -# a UPS directly connected to your computer. -# -# snmp hostname:port:vendor:community -# SNMP Network link to an SNMP-enabled -# UPS device. Vendor is the MIB used by -# the UPS device: can be "APC", "APC_NOTRAP" -# or "RFC" where APC is the powernet MIB, -# "APC_NOTRAP" is powernet with SNMP trap -# catching disabled, and RFC is the IETF's -# rfc1628 UPS-MIB. You usually want "APC". -# Port is usually 161. Community is usually -# "private". -# -# dumb /dev/tty** Old serial character device for use -# with simple-signaling UPSes. -# -# pcnet ipaddr:username:passphrase -# PowerChute Network Shutdown protocol -# which can be used as an alternative to SNMP -# with AP9617 family of smart slot cards. -# ipaddr is the IP address of the UPS mgmt -# card. username and passphrase are the -# credentials for which the card has been -# configured. -# -UPSTYPE apcsmart -DEVICE /dev/ttyS0 - - -# LOCKFILE -# Path for device lock file. Not used on Win32. -LOCKFILE /var/lock - -# SCRIPTDIR -# Directory in which apccontrol and event scripts are located. -SCRIPTDIR /etc/apcupsd - -# PWRFAILDIR -# Directory in which to write the powerfail flag file. This file -# is created when apcupsd initiates a system shutdown and is -# checked in the OS halt scripts to determine if a killpower -# (turning off UPS output power) is required. -PWRFAILDIR /etc - -# NOLOGINDIR -# Directory in which to write the nologin file. The existence -# of this flag file tells the OS to disallow new logins. -NOLOGINDIR /etc - - -# -# ======== Configuration parameters used during power failures ========== -# - -# The ONBATTERYDELAY is the time in seconds from when a power failure -# is detected until we react to it with an onbattery event. -# -# This means that, apccontrol will be called with the powerout argument -# immediately when a power failure is detected. However, the -# onbattery argument is passed to apccontrol only after the -# ONBATTERYDELAY time. If you don't want to be annoyed by short -# powerfailures, make sure that apccontrol powerout does nothing -# i.e. comment out the wall. -#ONBATTERYDELAY 6 - -# -# Note: BATTERYLEVEL, MINUTES, and TIMEOUT work in conjunction, so -# the first that occurs will cause the initation of a shutdown. -# - -# If during a power failure, the remaining battery percentage -# (as reported by the UPS) is below or equal to BATTERYLEVEL, -# apcupsd will initiate a system shutdown. -BATTERYLEVEL 5 - -# If during a power failure, the remaining runtime in minutes -# (as calculated internally by the UPS) is below or equal to MINUTES, -# apcupsd, will initiate a system shutdown. -MINUTES 3 - -# If during a power failure, the UPS has run on batteries for TIMEOUT -# many seconds or longer, apcupsd will initiate a system shutdown. -# A value of 0 disables this timer. -# -# Note, if you have a Smart UPS, you will most likely want to disable -# this timer by setting it to zero. That way, you UPS will continue -# on batteries until either the % charge remaing drops to or below BATTERYLEVEL, -# or the remaining battery runtime drops to or below MINUTES. Of course, -# if you are testing, setting this to 60 causes a quick system shutdown -# if you pull the power plug. -# If you have an older dumb UPS, you will want to set this to less than -# the time you know you can run on batteries. -TIMEOUT 0 - -# Time in seconds between annoying users to signoff prior to -# system shutdown. 0 disables. -ANNOY 300 - -# Initial delay after power failure before warning users to get -# off the system. -ANNOYDELAY 60 - -# The condition which determines when users are prevented from -# logging in during a power failure. -# NOLOGON [ disable | timeout | percent | minutes | always ] -NOLOGON disable - -# If KILLDELAY is non-zero, apcupsd will continue running after a -# shutdown has been requested, and after the specified time in -# seconds attempt to kill the power. This is for use on systems -# where apcupsd cannot regain control after a shutdown. -# KILLDELAY 0 disables -KILLDELAY 0 - -# -# ==== Configuration statements for Network Information Server ==== -# - -# NETSERVER [ on | off ] on enables, off disables the network -# information server. If netstatus is on, a network information -# server process will be started for serving the STATUS and -# EVENT data over the network (used by CGI programs). -NETSERVER on - -# NISIP -# IP address on which NIS server will listen for incoming connections. -# This is useful if your server is multi-homed (has more than one -# network interface and IP address). Default value is 0.0.0.0 which -# means any incoming request will be serviced. Alternatively, you can -# configure this setting to any specific IP address of your server and -# NIS will listen for connections only on that interface. Use the -# loopback address (127.0.0.1) to accept connections only from the -# local machine. -NISIP 0.0.0.0 - -# NISPORT default is 3551 as registered with the IANA -# port to use for sending STATUS and EVENTS data over the network. -# It is not used unless NETSERVER is on. If you change this port, -# you will need to change the corresponding value in the cgi directory -# and rebuild the cgi programs. -NISPORT 3551 - -# If you want the last few EVENTS to be available over the network -# by the network information server, you must define an EVENTSFILE. -EVENTSFILE /var/log/apcupsd.events - -# EVENTSFILEMAX -# By default, the size of the EVENTSFILE will be not be allowed to exceed -# 10 kilobytes. When the file grows beyond this limit, older EVENTS will -# be removed from the beginning of the file (first in first out). The -# parameter EVENTSFILEMAX can be set to a different kilobyte value, or set -# to zero to allow the EVENTSFILE to grow without limit. -EVENTSFILEMAX 10 - -# -# ========== Configuration statements used if sharing ============= -# a UPS with more than one machine - -# NETTIME -# Interval (in seconds) at which the NIS client polls the server. -# Used only when this apcupsd is a network client (UPSTYPE net). -#NETTIME 60 - -# -# Remaining items are for ShareUPS (APC expansion card) ONLY -# - -# UPSCLASS [ standalone | shareslave | sharemaster ] -# Normally standalone unless you share an UPS using an APC ShareUPS -# card. -UPSCLASS standalone - -# UPSMODE [ disable | share ] -# Normally disable unless you share an UPS using an APC ShareUPS card. -UPSMODE disable - -# -# ===== Configuration statements to control apcupsd system logging ======== -# - -# Time interval in seconds between writing the STATUS file; 0 disables -STATTIME 0 - -# Location of STATUS file (written to only if STATTIME is non-zero) -STATFILE /var/log/apcupsd.status - -# LOGSTATS [ on | off ] on enables, off disables -# Note! This generates a lot of output, so if -# you turn this on, be sure that the -# file defined in syslog.conf for LOG_NOTICE is a named pipe. -# You probably do not want this on. -LOGSTATS off - -# Time interval in seconds between writing the DATA records to -# the log file. 0 disables. -DATATIME 0 - -# FACILITY defines the logging facility (class) for logging to syslog. -# If not specified, it defaults to "daemon". This is useful -# if you want to separate the data logged by apcupsd from other -# programs. -#FACILITY DAEMON - -# -# ========== Configuration statements used in updating the UPS EPROM ========= -# - -# -# These statements are used only by apctest when choosing "Set EEPROM with conf -# file values" from the EEPROM menu. THESE STATEMENTS HAVE NO EFFECT ON APCUPSD. -# - -# UPS name, max 8 characters -#UPSNAME UPS_IDEN - -# Battery date - 8 characters -#BATTDATE mm/dd/yy - -# Sensitivity to line voltage quality (H cause faster transfer to batteries) -# SENSITIVITY H M L (default = H) -#SENSITIVITY H - -# UPS delay after power return (seconds) -# WAKEUP 000 060 180 300 (default = 0) -#WAKEUP 60 - -# UPS Grace period after request to power off (seconds) -# SLEEP 020 180 300 600 (default = 20) -#SLEEP 180 - -# Low line voltage causing transfer to batteries -# The permitted values depend on your model as defined by last letter -# of FIRMWARE or APCMODEL. Some representative values are: -# D 106 103 100 097 -# M 177 172 168 182 -# A 092 090 088 086 -# I 208 204 200 196 (default = 0 => not valid) -#LOTRANSFER 208 - -# High line voltage causing transfer to batteries -# The permitted values depend on your model as defined by last letter -# of FIRMWARE or APCMODEL. Some representative values are: -# D 127 130 133 136 -# M 229 234 239 224 -# A 108 110 112 114 -# I 253 257 261 265 (default = 0 => not valid) -#HITRANSFER 253 - -# Battery charge needed to restore power -# RETURNCHARGE 00 15 50 90 (default = 15) -#RETURNCHARGE 15 - -# Alarm delay -# 0 = zero delay after pwr fail, T = power fail + 30 sec, L = low battery, N = never -# BEEPSTATE 0 T L N (default = 0) -#BEEPSTATE T - -# Low battery warning delay in minutes -# LOWBATT 02 05 07 10 (default = 02) -#LOWBATT 2 - -# UPS Output voltage when running on batteries -# The permitted values depend on your model as defined by last letter -# of FIRMWARE or APCMODEL. Some representative values are: -# D 115 -# M 208 -# A 100 -# I 230 240 220 225 (default = 0 => not valid) -#OUTPUTVOLTS 230 - -# Self test interval in hours 336=2 weeks, 168=1 week, ON=at power on -# SELFTEST 336 168 ON OFF (default = 336) -#SELFTEST 336 diff --git a/net/apcupsd/files/apcupsd.init b/net/apcupsd/files/apcupsd.init deleted file mode 100644 index 545437796..000000000 --- a/net/apcupsd/files/apcupsd.init +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2006 OpenWrt.org -START=50 -STOP=50 - -start() { - /usr/sbin/apcupsd -f /etc/apcupsd/apcupsd.conf -} - -stop() { - kill $(cat /var/run/apcupsd.pid) -} diff --git a/net/apcupsd/files/apcupsd_mail.conf b/net/apcupsd/files/apcupsd_mail.conf deleted file mode 100644 index 51206c7b4..000000000 --- a/net/apcupsd/files/apcupsd_mail.conf +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -MAILPROG="/usr/sbin/smtp" -MAILHOST="mail:25" -FROM="OpenWrt" -TO="apcups@example.com" -HOSTNAME="OpenWrt" \ No newline at end of file diff --git a/net/apcupsd/files/changeme b/net/apcupsd/files/changeme deleted file mode 100644 index bcf448aba..000000000 --- a/net/apcupsd/files/changeme +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# This shell script if placed in /etc/apcupsd -# will be called by /etc/apcupsd/apccontrol when apcupsd -# detects that the battery should be replaced. -# We send an email message to root to notify him. -# -. /etc/apcupsd/apcupsd_mail.conf - -MSG="$HOSTNAME UPS battery needs changing NOW." -# -( - echo "$MSG" - echo " " - /usr/sbin/apcaccess status -) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO -exit 0 diff --git a/net/apcupsd/files/commfailure b/net/apcupsd/files/commfailure deleted file mode 100644 index b899195f6..000000000 --- a/net/apcupsd/files/commfailure +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# This shell script if placed in /etc/apcupsd -# will be called by /etc/apcupsd/apccontrol when apcupsd -# loses contact with the UPS (i.e. the serial connection is not responding). -# We send an email message to root to notify him. -# -. /etc/apcupsd/apcupsd_mail.conf - -MSG="$HOSTNAME Communications with UPS lost" -# -( - echo "$MSG" - echo " " - /usr/sbin/apcaccess status -) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO -exit 0 diff --git a/net/apcupsd/files/commok b/net/apcupsd/files/commok deleted file mode 100644 index cd5d1c62c..000000000 --- a/net/apcupsd/files/commok +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# This shell script if placed in /etc/apcupsd -# will be called by /etc/apcupsd/apccontrol when apcupsd -# restores contact with the UPS (i.e. the serial connection is restored). -# We send an email message to root to notify him. -# -. /etc/apcupsd/apcupsd_mail.conf - -MSG="$HOSTNAME Communications with UPS restored" -# -( - echo "$MSG" - echo " " - /usr/sbin/apcaccess status -) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO -exit 0 diff --git a/net/apcupsd/files/offbattery b/net/apcupsd/files/offbattery deleted file mode 100644 index 22c0b9848..000000000 --- a/net/apcupsd/files/offbattery +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# This shell script if placed in /etc/apcupsd -# will be called by /etc/apcupsd/apccontrol when the -# UPS goes back on to the mains after a power failure. -# We send an email message to root to notify him. -# -. /etc/apcupsd/apcupsd_mail.conf - -MSG="$HOSTNAME Power has returned" -# -( - echo "$MSG" - echo " " - /usr/sbin/apcaccess status -) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO -exit 0 diff --git a/net/apcupsd/files/onbattery b/net/apcupsd/files/onbattery deleted file mode 100644 index ee5f65302..000000000 --- a/net/apcupsd/files/onbattery +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# This shell script if placed in /etc/apcupsd -# will be called by /etc/apcupsd/apccontrol when the UPS -# goes on batteries. -# We send an email message to root to notify him. -# -. /etc/apcupsd/apcupsd_mail.conf - -MSG="$HOSTNAME Power Failure !!!" -# -( - echo "$MSG" - echo " " - /usr/sbin/apcaccess status -) | $MAILPROG -h $MAILHOST -f $FROM -s "$MSG" $TO -exit 0 diff --git a/net/apcupsd/patches/010-fix-include-paths.patch b/net/apcupsd/patches/010-fix-include-paths.patch deleted file mode 100644 index 21515441f..000000000 --- a/net/apcupsd/patches/010-fix-include-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/autoconf/variables.mak.in b/autoconf/variables.mak.in -index b67e467..6022434 100644 ---- a/autoconf/variables.mak.in -+++ b/autoconf/variables.mak.in -@@ -65,7 +65,7 @@ DRVLIBS = @PTHREAD_LFLAGS@ @DRVLIBS@ - X_LIBS = @X_LIBS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - --CPPFLAGS = @CPPFLAGS@ -I$(topdir)/include $(EXTRAINCS) -+CPPFLAGS = -I$(topdir)/include @CPPFLAGS@ $(EXTRAINCS) - CFLAGS = $(CPPFLAGS) @CFLAGS@ @PTHREAD_CFLAGS@ - CXXFLAGS = $(CPPFLAGS) @CXXFLAGS@ @PTHREAD_CFLAGS@ - LDFLAGS = @LDFLAGS@ diff --git a/net/fakeidentd/Makefile b/net/fakeidentd/Makefile deleted file mode 100644 index 0a852de47..000000000 --- a/net/fakeidentd/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (C) 2006-2012 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:=fakeidentd -PKG_VERSION:=2.6 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).c -PKG_SOURCE_URL:=http://distfiles.gentoo.org/distfiles/ -PKG_MD5SUM:=d26693c1a7c883d1432e05fb6f7ead6e -UNPACK_CMD=$(CP) $(DL_DIR)/$(PKG_SOURCE) $(1)/ - -include $(INCLUDE_DIR)/package.mk - -define Package/fakeidentd - SECTION:=net - CATEGORY:=Network - TITLE:=A static, secure identd. - URL:=http://www.guru-group.fi/~too/sw/releases/ -endef - -define Package/fakeidentd/description - A static secure identd, only one source file. -endef - -define Build/Compile - $(SHELL) "$(PKG_BUILD_DIR)/$(MAKE_PATH)/$(PKG_SOURCE)" \ - CC="$(TARGET_CC)" TRG="$(PKG_BUILD_DIR)/$(MAKE_PATH)/$(PKG_NAME)" \ - $(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS) \ - $(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) -DUSE_UNIX_OS -endef - -define Package/fakeidentd/install - $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) -endef - -$(eval $(call BuildPackage,fakeidentd)) diff --git a/net/fakeidentd/files/fakeidentd.init b/net/fakeidentd/files/fakeidentd.init deleted file mode 100644 index 4959ef224..000000000 --- a/net/fakeidentd/files/fakeidentd.init +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2006-2012 OpenWrt.org - -START=85 - -start() { - service_start /usr/sbin/fakeidentd -r -} - -stop() { - service_stop /usr/sbin/fakeidentd -} diff --git a/net/l7-protocols/Makefile b/net/l7-protocols/Makefile deleted file mode 100644 index ff095cb18..000000000 --- a/net/l7-protocols/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=l7-protocols -PKG_VERSION:=2009-05-28 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/l7-filter -PKG_MD5SUM:=91be154d12134dcdbc560cc7aa7fe4ce - -include $(INCLUDE_DIR)/uclibc++.mk -include $(INCLUDE_DIR)/package.mk - -define Package/l7-protocols - SECTION:=net - CATEGORY:=Network - TITLE:=Protocols for layer7 filtering - URL:=http://l7-filter.sourceforge.net/ - SUBMENU:=Firewall - DEPENDS:=iptables-mod-filter -endef - -define Package/l7-protocols/description - l7-filter classifies packets based on patterns in application - layer data. This allows correct classification of P2P traffic that - uses unpredictable ports as well as standard protocols running on - non-standard ports. -endef - -define Package/l7-protocols-testing - $(call Package/l7-protocols) - TITLE:=testing utilities for layer7 - DEPENDS+=l7-protocols $(CXX_DEPENDS) -endef - -define Package/l7-protocols-testing/description - testing utilities for layer 7 patterns -endef - -define Build/Configure -endef - -ifneq ($(SDK)$(CONFIG_PACKAGE_l7-protocols-testing),) - define Build/Compile - cd $(PKG_BUILD_DIR)/testing && $(MAKE) $(CONFIGURE_VARS) - endef -else - define Build/Compile - endef -endif - -define Package/l7-protocols/install - $(INSTALL_DIR) $(1)/etc/l7-protocols - $(CP) $(PKG_BUILD_DIR)/example_traffic \ - $(PKG_BUILD_DIR)/extra \ - $(PKG_BUILD_DIR)/file_types \ - $(PKG_BUILD_DIR)/groups.sh \ - $(PKG_BUILD_DIR)/malware \ - $(PKG_BUILD_DIR)/protocols \ - $(1)/etc/l7-protocols -endef - -define Package/l7-protocols-testing/install - $(INSTALL_DIR) $(1)/etc/l7-protocols/testing - $(CP) $(PKG_BUILD_DIR)/testing/data \ - $(1)/etc/l7-protocols/testing - $(INSTALL_BIN) \ - $(PKG_BUILD_DIR)/testing/rand{chars,printable} \ - $(PKG_BUILD_DIR)/testing/test_speed-{kernel,userspace} \ - $(PKG_BUILD_DIR)/testing/match_kernel \ - $(PKG_BUILD_DIR)/testing/doallspeeds.sh \ - $(PKG_BUILD_DIR)/testing/test_match.sh \ - $(PKG_BUILD_DIR)/testing/timeit.sh \ - $(1)/etc/l7-protocols/testing -endef - -$(eval $(call BuildPackage,l7-protocols)) -$(eval $(call BuildPackage,l7-protocols-testing)) diff --git a/net/l7-protocols/patches/100-testing_crosscompile.patch b/net/l7-protocols/patches/100-testing_crosscompile.patch deleted file mode 100644 index b5d395307..000000000 --- a/net/l7-protocols/patches/100-testing_crosscompile.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/testing/Makefile -+++ b/testing/Makefile -@@ -1,19 +1,19 @@ - all: randchars randprintable test_speed-kernel test_speed-userspace match_kernel - - randchars: randchars.c -- gcc -O2 -o randchars randchars.c -+ $(CC) $(CFLAGS) -o randchars randchars.c - - randprintable: randprintable.c -- gcc -O2 -o randprintable randprintable.c -+ $(CC) $(CFLAGS) -o randprintable randprintable.c - - test_speed-kernel: test_speed-kernel.c -- gcc -o test_speed-kernel test_speed-kernel.c -+ $(CC) $(CFLAGS) -o test_speed-kernel test_speed-kernel.c - - test_speed-userspace: test_speed-userspace.cpp l7-parse-patterns.cpp l7-parse-patterns.h -- g++ -Wall -o test_speed-userspace test_speed-userspace.cpp l7-parse-patterns.cpp -+ $(CXX) $(CXXFLAGS) -Wall -o test_speed-userspace test_speed-userspace.cpp l7-parse-patterns.cpp - - match_kernel: match-kernel.c -- gcc -O2 -o match_kernel match-kernel.c -+ $(CC) $(CFLAGS) -o match_kernel match-kernel.c - - clean: - rm -f randprintable randchars test_speed-kernel test_speed-userspace match_kernel diff --git a/net/l7-protocols/patches/101-testing-timeit.patch b/net/l7-protocols/patches/101-testing-timeit.patch deleted file mode 100644 index 665688927..000000000 --- a/net/l7-protocols/patches/101-testing-timeit.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- a/testing/timeit.sh -+++ b/testing/timeit.sh -@@ -1,11 +1,8 @@ - #!/bin/bash - --# "man 1 time" for details --export TIME="%U seconds" -- - add() - { -- if ! dc -e ""; then -+ if ! dc p >/dev/null 2>&1; then - echo you do not have dc, so I cannot add these numbers... - exit 1 - fi -@@ -14,7 +11,7 @@ add() - tot=0 - - while read n; do -- tot=`dc -e "$n $tot + pop" 2> /dev/null` -+ tot=`dc $n $tot + p 2> /dev/null` - done - - echo $tot seconds -@@ -34,7 +31,7 @@ extract() - - if [ ! $3 ] || [ $2 == "-h" ] || [ $2 == "--help" ]; then - echo -- echo Syntax: ./timeit.sh patternfile kernel\|userspace all\|print\|real [data_files] -+ echo Syntax: .//usr/bin/timeit.sh patternfile kernel\|userspace all\|print\|real [data_files] - echo - echo \"kernel\" uses the kernel pattern and library - echo \"userspace\" uses userspace pattern and library -@@ -72,12 +69,12 @@ echo Timing $1 - if [ $3 == "all" ]; then - echo Using all characters - if [ $2 == "kernel" ]; then -- if ! ./randchars | time $speedprog "`extract $1`" verbose; then -+ if ! ./randchars | /usr/bin/time $speedprog "`extract $1`" verbose 2>&1 >/dev/null | grep user | cut -d\ -f2; then - echo $speedprog failed. > /dev/stderr - exit 1 - fi - else -- if ! ./randchars | time $speedprog -f "$1" -v; then -+ if ! ./randchars | /usr/bin/time $speedprog -f "$1" -v 2>&1 >/dev/null | grep user | cut -d\ -f2; then - echo $speedprog failed. > /dev/stderr - exit 1 - fi -@@ -85,12 +82,12 @@ if [ $3 == "all" ]; then - elif [ $3 == "print" ]; then - echo Using only printable characters - if [ $2 == "kernel" ]; then -- if ! ./randprintable | time $speedprog "`extract $1`" verbose; then -+ if ! ./randprintable | /usr/bin/time $speedprog "`extract $1`" verbose 2>&1 >/dev/null | grep user | cut -d\ -f2; then - echo $speedprog failed. > /dev/stderr - exit 1 - fi - else -- if ! ./randprintable | time $speedprog -f "$1" -v; then -+ if ! ./randprintable | /usr/bin/time $speedprog -f "$1" -v 2>&1 >/dev/null | grep user | cut -d\ -f2; then - echo $speedprog failed. > /dev/stderr - exit 1 - fi -@@ -107,12 +104,12 @@ elif [ $3 == "real" ]; then - printf $f\\t - #echo `extract $1` - if [ $2 == "kernel" ]; then -- if ! cat $f | time $speedprog "`extract $1`" 2> /dev/stdout | tee -a tmp.$$; then -+ if ! cat $f | /usr/bin/time $speedprog "`extract $1`" 2>&1 >/dev/null | grep user | cut -d\ -f2 | tee -a tmp.$$; then - echo $speedprog failed. > /dev/stderr - exit 1 - fi - else -- if ! cat $f | time $speedprog -f "$1" 2> /dev/stdout | tee -a tmp.$$; then -+ if ! cat $f | /usr/bin/time $speedprog -f "$1" 2>&1 >/dev/null | grep user | cut -d\ -f2 | tee -a tmp.$$; then - echo $speedprog failed. > /dev/stderr - exit 1 - fi -@@ -123,12 +120,12 @@ elif [ $3 == "real" ]; then - for f in data/*; do - printf $f\\t - if [ $2 == "kernel" ]; then -- if ! cat $f | time $speedprog "`extract $1`" 2> /dev/stdout | tee -a tmp.$$; then -+ if ! cat $f | /usr/bin/time $speedprog "`extract $1`" 2>&1 >/dev/null | grep user | cut -d\ -f2 | tee -a tmp.$$; then - echo $speedprog failed. > /dev/stderr - exit 1 - fi - else -- if ! cat $f | time $speedprog -f "$1" 2> /dev/stdout | tee -a tmp.$$; then -+ if ! cat $f | /usr/bin/time $speedprog -f "$1" 2>&1 >/dev/null | grep user | cut -d\ -f2 | tee -a tmp.$$; then - echo $speedprog failed. > /dev/stderr - exit 1 - fi -@@ -137,7 +134,7 @@ elif [ $3 == "real" ]; then - fi - - printf Total:\ -- cat tmp.$$ | cut -d\ -f 2 | add -+ cat tmp.$$ | cut -ds -f 1| add - - rm tmp.$$ - else diff --git a/net/l7-protocols/patches/102-testing-doallspeeds.patch b/net/l7-protocols/patches/102-testing-doallspeeds.patch deleted file mode 100644 index 850a1d6a0..000000000 --- a/net/l7-protocols/patches/102-testing-doallspeeds.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/testing/doallspeeds.sh -+++ b/testing/doallspeeds.sh -@@ -25,11 +25,11 @@ for f in ../*/*.pat; do - printf `basename $f .pat` - - if [ $userspace ]; then -- gtime=`./timeit.sh $f userspace real | grep Total | cut -d\ -f 2` -+ gtime=`./timeit.sh $f userspace real | grep Total | cut -d\ -f 2 | awk '{print $1}'` - printf \\t$gtime - fi - if [ $kernel ]; then -- htime=`./timeit.sh $f kernel real | grep Total | cut -d\ -f 2` -+ htime=`./timeit.sh $f kernel real | grep Total | cut -d\ -f 2 | awk '{print $1}'` - printf \\t$htime - fi - printf \\n diff --git a/sound/ices/Makefile b/sound/ices/Makefile deleted file mode 100644 index be8e97534..000000000 --- a/sound/ices/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (C) 2009 Freifunk Leipzig -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ices -PKG_VERSION:=2.0.1 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ices/ -PKG_MD5SUM:=0d95ac34d59fed337028d5e7771076d8 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_FIXUP:=autoreconf - -include $(INCLUDE_DIR)/package.mk - -define Package/ices - SECTION:=sound - CATEGORY:=Sound - TITLE:=ices client for Icecast media streaming servers - URL:=http://xiph.org/ - DEPENDS:=+libshout +libxml2 +zlib +libogg +libvorbis +alsa-lib -endef - -define Package/ices/description - ices is a command line source client for Icecast media streaming servers. - It began as the successor of the old "shout" utility, and has since gained a - lot of useful features. -endef - -define Package/ices/install - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/ -endef - -CONFIGURE_ARGS+= \ - --with-ogg="$(STAGING_DIR)/usr/include" \ - --with-vorbis="$(STAGING_DIR)/usr/include" \ - -define Build/Configure - $(call Build/Configure/Default, \ - LDFLAGS="$(TARGET_LDFLAGS) -lz -lm" \ - ) -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ - LDFLAGS="$(TARGET_LDFLAGS) -lz -lm" -endef - -$(eval $(call BuildPackage,ices)) diff --git a/utils/dosfstools/Makefile b/utils/dosfstools/Makefile deleted file mode 100644 index 0f04c36b3..000000000 --- a/utils/dosfstools/Makefile +++ /dev/null @@ -1,96 +0,0 @@ -# -# Copyright (C) 2006-2012 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:=dosfstools -PKG_VERSION:=3.0.12 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://fossies.org/linux/misc -PKG_MD5SUM:=4c1f1e72b82371704f93ebdd3c7b6259 - -include $(INCLUDE_DIR)/package.mk - -define Package/dosfstools/Default - SECTION:=utils - CATEGORY:=Utilities - URL:=http://www.daniel-baumann.ch/software/dosfstools/ - SUBMENU:=Filesystem -endef - -define Package/dosfsck - $(call Package/dosfstools/Default) - TITLE:=dosfsck -endef - -define Package/dosfslabel - $(call Package/dosfstools/Default) - TITLE:=dosfslabel -endef - -define Package/mkdosfs - $(call Package/dosfstools/Default) - TITLE:=mkdosfs -endef - -define Package/dosfsck/description - Utilities to create and check MS-DOS FAT filesystems. - (fsck.vfat and fsck.msdos for checking integrity of FAT volumes) -endef - -define Package/dosfslabel/description - Utilities to create and check MS-DOS FAT filesystems. - (dosfslabel for reading and writing labels of FAT volumes) -endef - -define Package/mkdosfs/description - Utilities to create and check MS-DOS FAT filesystems. - (mkfs.vfat and mkfs.msdos for creating FAT volumes) -endef - -define Build/Configure -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - OPTFLAGS="$(TARGET_CFLAGS) -D_FILE_OFFSET_BITS=64" \ - PREFIX="/usr" \ - SBINDIR="/usr/sbin" \ - all - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - OPTFLAGS="$(TARGET_CFLAGS) -D_FILE_OFFSET_BITS=64" \ - PREFIX="$(PKG_INSTALL_DIR)/usr" \ - SBINDIR="$(PKG_INSTALL_DIR)/usr/sbin" \ - install-bin -endef - -define Package/dosfsck/install - $(INSTALL_DIR) $(1)/lib/functions/fsck - $(INSTALL_DATA) ./files/dosfsck.sh $(1)/lib/functions/fsck/ - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dosfsck $(1)/usr/sbin/ - (cd $(1)/usr/sbin; ln -sf dosfsck fsck.msdos; ln -sf dosfsck fsck.vfat) -endef - -define Package/dosfslabel/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dosfslabel $(1)/usr/sbin/ -endef - -define Package/mkdosfs/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkdosfs $(1)/usr/sbin/ - (cd $(1)/usr/sbin; ln -sf mkdosfs mkfs.msdos; ln -sf mkdosfs mkfs.vfat) -endef - -$(eval $(call BuildPackage,dosfsck)) -$(eval $(call BuildPackage,dosfslabel)) -$(eval $(call BuildPackage,mkdosfs)) diff --git a/utils/dosfstools/files/dosfsck.sh b/utils/dosfstools/files/dosfsck.sh deleted file mode 100644 index bcc29b95a..000000000 --- a/utils/dosfstools/files/dosfsck.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# Copyright 2010 Vertical Communications -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -fsck_dosfsck() { - dosfsck -p "$device" 2>&1 | logger -t "fstab: dosfsck ($device)" - local status="$?" - case "$status" in - 0|1) ;; #success - 2) reboot;; - 4) echo "dosfsck ($device): Warning! Uncorrected errors."| logger -t fstab - return 1 - ;; - *) echo "dosfsck ($device): Error $status. Check not complete."| logger -t fstab;; - esac - return 0 -} - -fsck_dos() { - fsck_dosfsck "$@" -} - -fsck_vfat() { - fsck_dosfsck "$@" -} - -append libmount_known_fsck "dos" -append libmount_known_fsck "vfat" diff --git a/utils/dosfstools/patches/002-linux_26_headers.patch b/utils/dosfstools/patches/002-linux_26_headers.patch deleted file mode 100644 index b55a7c83c..000000000 --- a/utils/dosfstools/patches/002-linux_26_headers.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/src/common.h -+++ b/src/common.h -@@ -19,7 +19,7 @@ - can be found in /usr/share/common-licenses/GPL-3 file. - */ - --#include -+#include - - #ifndef _COMMON_H - #define _COMMON_H ---- a/src/dosfsck.h -+++ b/src/dosfsck.h -@@ -31,7 +31,7 @@ - #define _LINUX_STRING_H_ /* hack to avoid inclusion of */ - #define _LINUX_FS_H /* hack to avoid inclusion of */ - --#include -+#include - #include - - #include ---- a/src/file.c -+++ b/src/file.c -@@ -33,7 +33,7 @@ - #define _LINUX_STRING_H_ /* hack to avoid inclusion of */ - #define _LINUX_FS_H /* hack to avoid inclusion of */ - --#include -+#include - - #include - ---- a/src/io.c -+++ b/src/io.c -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - #include - - #include "dosfsck.h" ---- a/src/mkdosfs.c -+++ b/src/mkdosfs.c -@@ -63,7 +63,7 @@ - #include - #include - --#include -+#include - - #if __BYTE_ORDER == __BIG_ENDIAN - diff --git a/utils/less/Makefile b/utils/less/Makefile deleted file mode 100644 index 46faf3f09..000000000 --- a/utils/less/Makefile +++ /dev/null @@ -1,88 +0,0 @@ -# -# Copyright (C) 2010-2012 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:=less -PKG_VERSION:=458 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.greenwoodsoftware.com/less -PKG_MD5SUM:=935b38aa2e73c888c210dedf8fd94f49 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/less/Default - SECTION:=utils - CATEGORY:=Utilities - TITLE:=Pager program similar to more - URL:=http://www.greenwoodsoftware.com/less/ -endef - -define Package/less/Default/description - Full version of GNU less utility -endef - -define Package/less - $(call Package/less/Default) - DEPENDS:=+libncurses - VARIANT:=narrow -endef - -define Package/less/description - $(call Package/less/Default/description) -endef - -define Package/less-wide - $(call Package/less/Default) - TITLE+= (Unicode) - DEPENDS:=+libncursesw - VARIANT:=wide -endef - -define Package/less-wide/description - $(call Package/less/Default/description) - This package contains the Unicode enabled version of less. -endef - -ifeq ($(BUILD_VARIANT),narrow) - CONFIGURE_VARS += \ - ac_cv_lib_ncursesw_initscr=no -endif - -ifeq ($(BUILD_VARIANT),wide) - CONFIGURE_VARS += \ - ac_cv_lib_ncursesw_initscr=yes -endif - -define Package/less/install - $(INSTALL_DIR) $(1)/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/less $(1)/bin/less -endef - -define Package/less/postinst -#!/bin/sh -[ -L "$${IPKG_INSTROOT}/usr/bin/less" ] && rm -f "$${IPKG_INSTROOT}/usr/bin/less" -exit 0 -endef - -define Package/less/postrm -#!/bin/sh -/bin/busybox less -h 2>&1 | grep -q BusyBox && ln -sf ../../bin/busybox /usr/bin/less -exit 0 -endef - -Package/less-wide/install = $(Package/less/install) -Package/less-wide/postinst = $(Package/less/postinst) -Package/less-wide/postrm = $(Package/less/postrm) - -$(eval $(call BuildPackage,less)) -$(eval $(call BuildPackage,less-wide)) diff --git a/utils/watchcat/Makefile b/utils/watchcat/Makefile deleted file mode 100644 index c0a92915e..000000000 --- a/utils/watchcat/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (C) 2010 segal.di.ubi.pt -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=watchcat -PKG_VERSION:=1 -PKG_RELEASE:=5 - -PKG_MAINTAINER:=Nuno Goncalves - -include $(INCLUDE_DIR)/package.mk - -define Package/watchcat - SECTION:=utils - CATEGORY:=Utilities - TITLE:=Enable the configuration of programed reboots -endef - -define Package/watchcat/description -Allows to configure a periodically reboot, or after loosing internet connectivity. Configured trough UCI /etc/config/system. -endef - -define Package/watchcat/conffiles -/etc/config/system -endef - -define Build/Compile -endef - -define Package/watchcat/install - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/initd_watchcat $(1)/etc/init.d/watchcat - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) ./files/watchcat.sh $(1)/usr/bin/watchcat.sh - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_BIN) ./files/uci_defaults_watchcat $(1)/etc/uci-defaults/50-watchcat -endef - -$(eval $(call BuildPackage,watchcat)) diff --git a/utils/watchcat/files/initd_watchcat b/utils/watchcat/files/initd_watchcat deleted file mode 100644 index 36e353f5f..000000000 --- a/utils/watchcat/files/initd_watchcat +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=97 - -PIDFILE="/tmp/run/watchcat" - -append_string() { - local varname="$1"; local add="$2"; local separator="${3:- }"; local actual - eval "actual=\$$varname" - - new="${actual:+$actual$separator}$add" - eval "$varname=\$new" -} - -timetoseconds() { - local time=$1 - unset seconds - - { [ "$time" -ge 1 ] 2> /dev/null && seconds="$time"; } || \ - { [ "${time%s}" -ge 1 ] 2> /dev/null && seconds="${time%s}"; } || \ - { [ "${time%m}" -ge 1 ] 2> /dev/null && seconds=$((${time%m}*60)); } || \ - { [ "${time%h}" -ge 1 ] 2> /dev/null && seconds=$((${time%h}*3600)); } || \ - { [ "${time%d}" -ge 1 ] 2> /dev/null && seconds=$((${time%d}*86400)); } -} - -load_watchcat() { - config_get period $1 period - config_get mode $1 mode "allways" - config_get pinghosts $1 pinghosts "8.8.8.8" - config_get pingperiod $1 pingperiod - config_get forcedelay $1 forcedelay "0" - - error="" - - timetoseconds "$period" - period="$seconds" - [ "$period" -ge 1 ] \ - || append_string "error" 'period is not a valid time value (ex: "30"; "4m"; "6h"; "2d")' "; " - [ "$mode" = "allways" -o "$mode" = "ping" ] \ - || append_string "error" "mode must be 'allways' or 'ping'" "; " - [ -n "$pinghosts" -o "$mode" = "allways" ] \ - || append_string "error" "pinghosts must be set when in 'ping' mode" "; " - [ "$mode" = "ping" ] && { - if [ -n "$pingperiod" ] - then - timetoseconds "$pingperiod" - pingperiod="$seconds" - if [ "$pingperiod" -ge 0 ] - then - [ "$pingperiod" -le "$period" ] \ - || append_string "error" "pingperiod must be less than period" "; " - else - append_string "error" 'pingperiod is not a valid time value (ex: "30"; "4m"; "6h"; "2d")' "; " - fi - else - pingperiod="$((period/20))" - fi - } - [ "$pingperiod" -lt "$period" -o "$mode" = "allways" ] \ - || append_string "error" "pingperiod is not recognized" "; " - [ "$forcedelay" -ge 0 ] \ - || append_string "error" "forcedelay must be a integer greater or equal than 0, where 0 means disabled" "; " - - [ -n "$error" ] && { logger -p user.err -t "watchcat" "reboot program $1 not started - $error"; return; } - - if [ "$mode" = "allways" ] - then - /usr/bin/watchcat.sh "allways" "$period" "$forcedelay" & - logger -p user.info -t "wathchat" "started task (mode=$mode;period=$period;forcedelay=$forcedelay)" - else - /usr/bin/watchcat.sh "period" "$period" "$forcedelay" "$pinghosts" "$pingperiod" & - logger -p user.info -t "wathchat" "started task (mode=$mode;period=$period;pinghosts=$pinghosts;pingperiod=$pingperiod;forcedelay=$forcedelay)" - fi - - echo $! >> "${PIDFILE}.pids" -} - -stop() { - if [ -f "${PIDFILE}.pids" ] - then - logger -p user.info -t "watchcat" "stopping all tasks" - - while read pid - do - kill "$pid" - done < "${PIDFILE}.pids" - - rm "${PIDFILE}.pids" - - logger -p user.info -t "watchcat" "all tasks stopped" - else - logger -p user.info -t "watchcat" "no tasks running" - fi -} - -start() { - [ -f "${PIDFILE}.pids" ] && stop - - config_load system - if [ -n "$(uci show system.@watchcat[0])" ] # at least one watchcat section exists - then - logger -p user.info -t "watchcat" "starting all tasks" - config_foreach load_watchcat watchcat - logger -p user.info -t "watchcat" "all tasks started" - else - logger -p user.info -t "watchcat" "no tasks defined" - fi -} diff --git a/utils/watchcat/files/uci_defaults_watchcat b/utils/watchcat/files/uci_defaults_watchcat deleted file mode 100644 index 49def81eb..000000000 --- a/utils/watchcat/files/uci_defaults_watchcat +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -uci -q show system.@watchcat[0] || { - uci add system watchcat - uci set system.@watchcat[0].period=6h - uci set system.@watchcat[0].mode=ping - uci set system.@watchcat[0].pinghosts=8.8.8.8 - uci set system.@watchcat[0].forcedelay=30 - uci commit -} diff --git a/utils/watchcat/files/watchcat.sh b/utils/watchcat/files/watchcat.sh deleted file mode 100644 index ee9b6bdfa..000000000 --- a/utils/watchcat/files/watchcat.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh - -mode="$1" - -shutdown_now() { - local forcedelay="$1" - - reboot & - - [ "$forcedelay" -ge 1 ] && { - sleep "$forcedelay" - - echo b > /proc/sysrq-trigger # Will immediately reboot the system without syncing or unmounting your disks. - } -} - -watchcat_allways() { - local period="$1"; local forcedelay="$2" - - sleep "$period" && shutdown_now "$forcedelay" -} - -watchcat_ping() { - local period="$1"; local forcedelay="$2"; local pinghosts="$3"; local pingperiod="$4" - - time_now="$(cat /proc/uptime)" - time_now="${time_now%%.*}" - time_lastcheck="$time_now" - time_lastcheck_withinternet="$time_now" - - while true - do - # account for the time ping took to return. With a ping time of 5s, ping might take more than that, so it is important to avoid even more delay. - time_now="$(cat /proc/uptime)" - time_now="${time_now%%.*}" - time_diff="$((time_now-time_lastcheck))" - - [ "$time_diff" -lt "$pingperiod" ] && { - sleep_time="$((pingperiod-time_diff))" - sleep "$sleep_time" - } - - time_now="$(cat /proc/uptime)" - time_now="${time_now%%.*}" - time_lastcheck="$time_now" - - for host in "$pinghosts" - do - if ping -c 1 "$host" &> /dev/null - then - time_lastcheck_withinternet="$time_now" - else - time_diff="$((time_now-time_lastcheck_withinternet))" - logger -p daemon.info -t "watchcat[$$]" "no internet connectivity for $time_diff seconds. Reseting when reaching $period" - fi - done - - time_diff="$((time_now-time_lastcheck_withinternet))" - [ "$time_diff" -ge "$period" ] && shutdown_now "$forcedelay" - - done -} - - if [ "$mode" = "allways" ] - then - watchcat_allways "$2" "$3" - else - watchcat_ping "$2" "$3" "$4" "$5" - fi