diff options
16 files changed, 264 insertions, 88 deletions
diff --git a/net-dialup/martian/ChangeLog b/net-dialup/martian-modem/ChangeLog index 3206d757..9894889d 100644 --- a/net-dialup/martian/ChangeLog +++ b/net-dialup/martian-modem/ChangeLog @@ -1,7 +1,10 @@ -# ChangeLog for net-dialup/martian +# ChangeLog for net-dialup/martian-modem # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Dec 2012; Martin Väth <martin@mvath.de> + Use from main Gentoo tree but keep grsecurity patch. + 21 Sep 2012; Martin Väth <martin@mvath.de> Bump to EAPI=5 diff --git a/net-dialup/martian/Manifest b/net-dialup/martian-modem/Manifest index 5774fade..5774fade 100644 --- a/net-dialup/martian/Manifest +++ b/net-dialup/martian-modem/Manifest diff --git a/net-dialup/martian/files/grsecurity.patch b/net-dialup/martian-modem/files/martian-modem-20100123-grsecurity.patch index 332680d9..332680d9 100644 --- a/net-dialup/martian/files/grsecurity.patch +++ b/net-dialup/martian-modem/files/martian-modem-20100123-grsecurity.patch diff --git a/net-dialup/martian-modem/files/martian-modem-20100123-makefile.patch b/net-dialup/martian-modem/files/martian-modem-20100123-makefile.patch new file mode 100644 index 00000000..e6ce7ca7 --- /dev/null +++ b/net-dialup/martian-modem/files/martian-modem-20100123-makefile.patch @@ -0,0 +1,34 @@ +--- martian-full-20100123/Makefile 2008-07-02 15:42:48.000000000 -0800 ++++ martian-full-20100123.new/Makefile 2012-10-08 12:14:33.284275312 -0800 +@@ -1,10 +1,10 @@ + +-KERNEL_DIR:=/lib/modules/$(shell uname -r)/build +-SUBLEVEL:=$(shell echo $(KERNEL_DIR) | cut -d. -f3 | cut -d. -f1 | cut -d- -f1) +-# support begins at SUBLEVEL 20 +-after20:=$(shell if [ "$(SUBLEVEL)" -gt 20 ] ;then echo OK; fi) ++#KERNEL_DIR:=/lib/modules/$(shell uname -r)/build ++#SUBLEVEL:=$(shell echo $(KERNEL_DIR) | cut -d. -f3 | cut -d. -f1 | cut -d- -f1) ++## support begins at SUBLEVEL 20 ++#after20:=$(shell if [ "$(SUBLEVEL)" -gt 20 ] ;then echo OK; fi) + +-ifdef after20 ++#ifdef after20 + all: + $(MAKE) -C kmodule/ modules + $(MAKE) -C modem/ all +@@ -14,11 +14,11 @@ + $(MAKE) -C kmodule/ install + $(MAKE) -C modem/ install + +-else +-20less: +- @echo "The martian_dev.ko driver and the complementary helper martian_helper are for use with kernels after 2.6.20. Use the martian-20080407.tar.gz for earlier kernels." ++#else ++#20less: ++# @echo "The martian_dev.ko driver and the complementary helper martian_helper are for use with kernels after 2.6.20. Use the martian-20080407.tar.gz for earlier kernels." + +-endif ++#endif + + clean: + $(MAKE) -C kmodule/ clean diff --git a/net-dialup/martian-modem/files/martian-modem.conf.d b/net-dialup/martian-modem/files/martian-modem.conf.d new file mode 100644 index 00000000..47e2f62b --- /dev/null +++ b/net-dialup/martian-modem/files/martian-modem.conf.d @@ -0,0 +1,45 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/martian-modem/files/martian-modem.conf.d,v 1.1 2012/12/15 16:41:36 pacho Exp $ +# +### Configuration for martian-modem initscript +# +### DEVICE +# Device that will martian-modem daemon create to act as modem device. +# Default is /dev/ttySM0. +#DEVICE="/dev/ttySM0" +# +# +### USER/GROUP +# User and group that will have access to the modem device. +# Default values are nobody/dialout. +# Note: the daemon itself needs to be run as root! +#USER="nobody" +#GROUP="dialout" +# +# +### MARTIAN_OPTS +# Other options to be passed to the daemon, see description below. +# Defaults to empty. +# --realtime - raise priority of threads to realtime. +# --smp - true smp (symmetric multiprocessing) mode. +# --country=<country> - two-letter code for the country. +# Run `/usr/sbin/martian_modem --info countries` for list. +# --no-cdclose - keep working with client when carrier lost. +# --hide-pty - save pty from others as soon its open. Client +# should notify it's here writing to device. For callback feature. +#MARTIAN_OPTS="" +# +# +### LOGGING +# Should we log to syslog [YES/NO] +# Default to YES. If you do not want this, say NO here to use LOGFILE instead. +#USE_SYSLOG="YES" +# Alternatively, you can log to a separate file. The default location is below. +#LOGFILE="/var/log/martian-modem.log" +# +# +### DEBUG +# How verbose should the log be [1-5] +# Default debug_level=1; debug_level=3 is suitable for normal debugging. +#DEBUG_LEVEL=1 diff --git a/net-dialup/martian-modem/files/martian-modem.init.d b/net-dialup/martian-modem/files/martian-modem.init.d new file mode 100644 index 00000000..3c5b8561 --- /dev/null +++ b/net-dialup/martian-modem/files/martian-modem.init.d @@ -0,0 +1,50 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/martian-modem/files/martian-modem.init.d,v 1.1 2012/12/15 16:41:36 pacho Exp $ + +daemon=/usr/sbin/martian_modem +description="Initscript to run the userspace daemon for winmodems supported by martian-modem driver" + +: ${device:=${DEVICE:-/dev/ttySM0}} +: ${logfile:=${LOGFILE:-/var/log/martian-modem.log}} +: ${user:=${USER:-nobody}} +: ${group:=${GROUP:-dialout}} +: ${debug_level:=${DEBUG_LEVEL:-1}} +: ${use_syslog:=${USE_SYSLOG:-YES}} +pidfile=/var/run/${SVCNAME}.pid + +depend() { + need localmount + [ "${use_syslog}" = "YES" ] && use syslog +} + +start() { + if [ -e /proc/modules ] ; then + local modem= + for modem in /dev/modem /dev/ttySM[0-9]* ; do + [ -e "${modem}" ] && break + done + fi + if [ ! -e "${modem}" ] ; then + modprobe martian-dev || eerror $? "Error loading martian-dev module" + fi + + if ! yesno "${use_syslog}" ; then + martian_opts="${MARTIAN_OPTS} --log=${logfile}" + else + martian_opts="${MARTIAN_OPTS} --syslog" + fi + + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --exec ${daemon} --user ${user}:${group} \ + --pidfile ${pidfile} --make-pidfile --background \ + -- ${martian_opts} --debug=${debug_level} ${device} + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --pidfile ${pidfile} + eend $? +} diff --git a/net-dialup/martian-modem/martian-modem-20100123.ebuild b/net-dialup/martian-modem/martian-modem-20100123.ebuild new file mode 100644 index 00000000..f9288b7f --- /dev/null +++ b/net-dialup/martian-modem/martian-modem-20100123.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +inherit linux-mod eutils + +MY_P="martian-full-${PV}" +DESCRIPTION="ltmodem alternative driver providing support for Agere Systems winmodems" +HOMEPAGE="http://packages.debian.org/sid/martian-modem-source http://phep2.technion.ac.il/linmodems/packages/ltmodem/kernel-2.6/martian" +#SRC_URI="mirror://debian/pool/non-free/m/martian-modem/${MY_P}.tar.gz" +#SRC_URI="http://phep2.technion.ac.il/linmodems/packages/ltmodem/kernel-2.6/martian/${MY_P}.tar.gz" +SRC_URI="http://linmodems.technion.ac.il/packages/ltmodem/kernel-2.6/martian/${MY_P}.tar.gz" + +LICENSE="GPL-2 AgereSystems-WinModem" +KEYWORDS="~amd64 ~x86 -*" +IUSE="" + +DEPEND="!net-dialup/ltmodem" +RDEPEND="${DEPEND}" + +# Do NOT remove this. Stripping results in broken communication +# with core state communication channel (also see QA_* stuff below) +RESTRICT="strip" + +# contains proprietary precompiled 32 bit ltmdmobj.o +QA_PREBUILT="usr/sbin/martian_modem" + +S="${WORKDIR}/${P/modem/full}" +MODULE_NAMES="martian_dev(ltmodem::kmodule)" +CONFIG_CHECK="SERIAL_8250" +SERIAL_8250_ERROR="This driver requires you to compile your kernel with serial core (CONFIG_SERIAL_8250) support." + +pkg_setup() { + linux-mod_pkg_setup + + if kernel_is 2 4; then + eerror "This driver works only with 2.6 kernels!" + die "unsupported kernel detected" + fi +} + +src_prepare() { + # Exclude Makefile kernel version check, we used kernel_is above. + # TODO: More exactly, martian-modem-full-20100123 is for >kernel-2.6.20! + epatch "${FILESDIR}/${P}-makefile.patch" + epatch "${FILESDIR}/${P}-grsecurity.patch" + + # fix compile on amd64 + sed -i -e "/^HOST.*$/s:uname -i:uname -m:" modem/Makefile || die "sed failed" + + BUILD_TARGETS="all" + BUILD_PARAMS="KERNEL_DIR='${KV_DIR}' SUBLEVEL='${KV_PATCH}'" +} + +src_install() { + linux-mod_src_install + + # userspace daemon and initscripts stuff + dosbin modem/martian_modem + newconfd "${FILESDIR}/${PN}.conf.d" ${PN} + newinitd "${FILESDIR}/${PN}.init.d" ${PN} +} + +pkg_postinst() { + linux-mod_pkg_postinst + + if linux_chkconfig_present SMP ; then + elog "You have SMP (symmetric multi processor) support enabled in kernel." + elog "You should run martian-modem with --smp enabled in MARTIAN_OPTS." + fi + if ! has_version net-dialup/martian-modem; then + elog "See /etc/conf.d/${PN} for configuration options." + elog "After you have finished the configuration, you need to run /etc/init.d/${PN} start" + elog + fi + if [ "$(rc-config list default | grep martian-modem)" = "" ]; then + elog "To run the userspace daemon automatically on every boot, just add it to a runlevel:" + elog "rc-update add ${PN} default" + elog + fi + if has_version net-dialup/wvdial; then + elog "If using net-dialup/wvdial, you need \"Carrier Check = no\" line." + fi +} diff --git a/net-dialup/martian-modem/metadata.xml b/net-dialup/martian-modem/metadata.xml new file mode 100644 index 00000000..21c33b12 --- /dev/null +++ b/net-dialup/martian-modem/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer> + <email>rogerx.oss@gmail.com</email> + <name>Roger</name> + <description>Please assign bugs</description> +</maintainer> +<maintainer> + <email>pacho@gentoo.org</email> + <description>proxy-maintainer, please CC on bugs</description> +</maintainer> +</pkgmetadata> diff --git a/net-dialup/martian/martian-20100123.ebuild b/net-dialup/martian/martian-20100123.ebuild deleted file mode 100644 index 7ddce3a1..00000000 --- a/net-dialup/martian/martian-20100123.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -inherit linux-mod eutils - -ARCHRUMP="${PN}-full-${PV}" -DESCRIPTION="Winmodems with Lucent Apollo (ISA) and Mars (PCI) chipsets" -HOMEPAGE="http://linmodems.technion.ac.il/" -SRC_URI="http://linmodems.technion.ac.il/packages/ltmodem/kernel-2.6/martian/${ARCHRUMP}.tar.gz" - -LICENSE="GPL-2 AgereSystems-WinModem" -KEYWORDS="-* ~x86" -IUSE="" -SLOT="0" - -RESTRICT="mirror strip" - -DEPEND="" -RDEPEND="" - -S="${WORKDIR}/${ARCHRUMP}" - -MODULE_NAMES="martian_dev(ltmodem::kmodule)" -CONFIG_CHECK="SERIAL_8250" -SERIAL_8250_ERROR="This driver requires you to compile your kernel with serial core (CONFIG_SERIAL_8250) support." - -pkg_setup() { - linux-mod_pkg_setup - - if kernel_is lt 2 6 21 - then eerror "This driver works only with 2.6.21 or newer kernels!" - die "unsupported kernel detected" - fi - - BUILD_TARGETS="all" - BUILD_PARAMS="KERNEL_DIR='${KV_DIR}' SUBLEVEL='21'" -} - -src_prepare() { - epatch "${FILESDIR}/grsecurity.patch" - epatch_user -} - -src_install() { - # install kernel module - linux-mod_src_install - dosbin modem/martian_modem -} - -pkg_postinst() { - linux-mod_pkg_postinst - - [ "$ROOT" = "/" ] && /sbin/update-modules - - ewarn - ewarn "To make the modem available modprobe martian_dev and run \"martian_modem\"." - ewarn "This will make the modem available as /dev/ttySM0." - ewarn "When using wvdial add \"Carrier Check = no\" line." -} diff --git a/net-dialup/martian/metadata.xml b/net-dialup/martian/metadata.xml deleted file mode 100644 index 73a6d343..00000000 --- a/net-dialup/martian/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>martin@mvath.de</email> - <name>Martin Väth</name> - </maintainer> -</pkgmetadata> diff --git a/sys-fs/squash_dir/ChangeLog b/sys-fs/squash_dir/ChangeLog index d480b7ee..318bb285 100644 --- a/sys-fs/squash_dir/ChangeLog +++ b/sys-fs/squash_dir/ChangeLog @@ -2,12 +2,20 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ -*squash_dir-12.3 (23 Nov 2012) +*squash_dir-12.5 (16 Dec 2012) + + 16 Dec 2012; Martin Väth <martin@mvath.de> + Version bump. ewarn instead of elog, but only if necessary. + Follow upstream default order. + +*squash_dir-12.4 (01 Dec 2012) 01 Dec 2012; Martin Väth <martin@mvath.de> Version bump, remove old ebuild. Provide USE for ORDER default Print logs instead of making hard dependencies +*squash_dir-12.3 (23 Nov 2012) + 23 Nov 2012; Martin Väth <martin@mvath.de> Version bump, remove old ebuild. Provide USE for ORDER default diff --git a/sys-fs/squash_dir/Manifest b/sys-fs/squash_dir/Manifest index 01169a0d..f4032213 100644 --- a/sys-fs/squash_dir/Manifest +++ b/sys-fs/squash_dir/Manifest @@ -1 +1 @@ -DIST squash_dir-12.4.tar.gz 27588 SHA256 604729ec6cd79dde501ef40cd5ed7f7d65ca446066a212467c0ad5b1b9cc573e SHA512 5df3b92910350e1f1602944f8ce030f17f38b4c25880895405bff1f18cd89241fddcca4550ab45fea8e85fbb003e863238713e9b233c5ae18d7e89f79dd53c57 WHIRLPOOL 3e4c2d395311b5fc4f874874f64f67de0bf152ee034849af97873921e66861587c30f7bcbdc1936491815f97b2e8af608c78cf47828a3fbb7ee80a3bf2ec8e44 +DIST squash_dir-12.5.tar.gz 27826 SHA256 8b754c2437de39b1315b9969919a8b80a973ac9a3d8e13019263d13e4254c776 SHA512 ec0df50e0be2da933322e5acf8b8f17d26aebb132fa19adb2c108c75dcad42d193a6384e6aca04c27c78750b53db18437cdb78c5ed47a3c8e35637f1afc099ed WHIRLPOOL 468d6d1ebdce43874b55838cd1cbb0c347aea8a8e43b387772e7a40a2009ba5af2517a70ddf60d5248ef01302d55e3d068ff1a4a845776f188490ae98f0e8d0a diff --git a/sys-fs/squash_dir/squash_dir-12.4.ebuild b/sys-fs/squash_dir/squash_dir-12.5.ebuild index 0e511922..a357a94c 100644 --- a/sys-fs/squash_dir/squash_dir-12.4.ebuild +++ b/sys-fs/squash_dir/squash_dir-12.5.ebuild @@ -36,27 +36,28 @@ src_configure() { "$(use_with zsh-completion)" ${order:+"--with-first-order=${order}"} } +linux_config_missing() { + ! linux_config_exists || ! linux_chkconfig_present "${1}" +} + pkg_postinst() { - local CONFIG_CHECK fs=overlayfs sep=: + local fs=aufs use unionfs-fuse && fs=unionfs-fuse use aufs && fs=aufs use overlayfs && fs=overlayfs CONFIG_CHECK="~SQUASHFS" case ${fs} in overlayfs) - CONFIG_CHECK="${CONFIG_CHECK} ~OVERLAYFS_FS" - elog "To use ${PN} activate overlayfs in your kernel." - elog "Unless you use a patched kernel, apply e.g. top patches from some head of" - elog "http://git.kernel.org/?p=linux/kernel/git/mszeredi/vfs.git;a=summary" - sep=elog;; + if linux_config_missing 'OVERLAYFS_FS' + then ewarn "To use ${PN} activate overlayfs in your kernel." + ewarn "Unless you use a patched kernel, apply e.g. top patches from some head of" + ewarn "http://git.kernel.org/?p=linux/kernel/git/mszeredi/vfs.git;a=summary" + fi;; aufs) - if ! has_version sys-fs/aufs3 && ! has_version sys-fs/aufs2 - then CONFIG_CHECK="${CONFIG_CHECK} ~AUFS_FS" - elog "To use ${PN} activate aufs in your kernel. Use e.g. sys-fs/aufs*" - sep=elog + if ! has_version sys-fs/aufs3 && ! has_version sys-fs/aufs2 && linux_config_missing 'AUFS_FS' + then ewarn "To use ${PN} activate aufs in your kernel. Use e.g. sys-fs/aufs*" fi;; esac - check_extra_config if ! has_version sys-fs/squashfs-tools[progress-redirect] then ${sep} elog "For better output of ${PN}, it is recommended to install" diff --git a/www-plugins/duckduckgo/ChangeLog b/www-plugins/duckduckgo/ChangeLog index 9a351774..f941915d 100644 --- a/www-plugins/duckduckgo/ChangeLog +++ b/www-plugins/duckduckgo/ChangeLog @@ -2,17 +2,22 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ -*duckduckgo-0.2.8-r1 (07 Dec 2010) +*duckduckgo-0.2.9 (16 Dec 2012) + + 16 Dec 2012; Martin Väth <martin@mvath.de> + Bump version. Remove old ebuild. + +*duckduckgo-0.2.8-r1 (07 Dec 2012) 07 Dec 2012; Martin Väth <martin@mvath.de> Fix download and rename ebuild to force a true bump -*duckduckgo-0.2.8 (23 Nov 2010) +*duckduckgo-0.2.8 (23 Nov 2012) 23 Nov 2012; Martin Väth <martin@mvath.de> Bump version. Remove old ebuild. -*duckduckgo-0.2.7 (04 Nov 2010) +*duckduckgo-0.2.7 (04 Nov 2012) 04 Nov 2012; Martin Väth <martin@mvath.de> New ebuild. diff --git a/www-plugins/duckduckgo/Manifest b/www-plugins/duckduckgo/Manifest index 11391ffd..2ecbf372 100644 --- a/www-plugins/duckduckgo/Manifest +++ b/www-plugins/duckduckgo/Manifest @@ -1 +1 @@ -DIST duckduckgo_for_firefox-0.2.8-fx.xpi 293557 SHA256 42cf1aea84317c2030de54ea237372fd67f4f052658e2a19264f1182fe7349ad SHA512 a72ee6c0152e9c6681a67946be05111a838edf5c5095c11dadc0694a2f9d0e0c2bcecd187f336542576b2378b426609f9f2ba58f2f054a6747fe248e0bc0190d WHIRLPOOL 231e0ba4e6a5c0a6aa90ee0cadf1071c597190512989361218f3415965710ceffb338b4aa17aea96d728057ce693df85ec3286df5f2fd8f81a980b986cd9c159 +DIST duckduckgo_for_firefox-0.2.9-fx.xpi 293563 SHA256 8364138e63f085e101ba79384a61bfc663586154c8bcadfd7779f1b1184c6083 SHA512 26048971b1084159e1c3282cf0110f6393aa6fd9b40515dae7c3e5014f5c1b4e3d0f1327d62dc98d756525ca5be2d7b055b060e07f5b7c066b16d6261446a2e4 WHIRLPOOL d933188c00ec5d8372a1595aa48f5abe1c6ed07e6b0852b54995bcd0e748f97f85e53745ab125980201de12586e936d03e977fa19bf3ad49103caabc8fec12f3 diff --git a/www-plugins/duckduckgo/duckduckgo-0.2.8-r1.ebuild b/www-plugins/duckduckgo/duckduckgo-0.2.9.ebuild index 3190371e..99cfcbcd 100644 --- a/www-plugins/duckduckgo/duckduckgo-0.2.8-r1.ebuild +++ b/www-plugins/duckduckgo/duckduckgo-0.2.9.ebuild @@ -3,13 +3,14 @@ # $Header: $ EAPI=5 +MV_MOZ_MOZILLAS="firefox" inherit mv_mozextension RESTRICT="mirror" mPN="${PN}_for_firefox-${PV}" DESCRIPTION="Firefox plugin: enable duckduckgo search engine" HOMEPAGE="http://addons.mozilla.org/firefox/addon/xclear/" -SRC_URI="https://addons.mozilla.org/firefox/downloads/file/179120/${mPN}-fx.xpi" +SRC_URI="http://releases.mozilla.org/pub/mozilla.org/addons/385621/${mPN}-fx.xpi" LICENSE="GPL-2" SLOT="0" |