commit: 8092249aa0318301305a230f5ea67475e83e1f09 Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> AuthorDate: Tue Feb 4 19:16:44 2020 +0000 Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org> CommitDate: Tue Feb 4 19:28:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8092249a
media-plugins/vdr-wapd: pmasked removal bug 703970 Closes: https://bugs.gentoo.org/703970 Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org> media-plugins/vdr-wapd/Manifest | 2 - media-plugins/vdr-wapd/files/confd | 8 -- media-plugins/vdr-wapd/files/rc-addon.sh | 9 -- .../vdr-wapd/files/vdr-wapd-0.9-gentoo.diff | 14 --- .../vdr-wapd/files/vdr-wapd-0.9_gcc-4.1.x.diff | 12 --- media-plugins/vdr-wapd/files/wapaccess | 5 - media-plugins/vdr-wapd/files/wapd.mk | 108 --------------------- media-plugins/vdr-wapd/files/waphosts | 10 -- media-plugins/vdr-wapd/metadata.xml | 8 -- media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild | 44 --------- 10 files changed, 220 deletions(-) diff --git a/media-plugins/vdr-wapd/Manifest b/media-plugins/vdr-wapd/Manifest deleted file mode 100644 index ece62c2ff89..00000000000 --- a/media-plugins/vdr-wapd/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST vdr-wapd-0.9.tgz 31975 BLAKE2B 5cef88fb6ea7582cfcdd76cb43c469aa99f10bec6db16abbcbdf596c889e41912dfe9c5344720a5e26634e50df0a4d3214e823e4fb97c4a3129419ecc99feec4 SHA512 787bc433896e01efb482507251f4a6cb878ce40b869625ff5b7177f64f4dba4b4dcffa648c39d1d8c1930da5fb98db9155ebc40ed349bf2093a5e10f7314f1dd -DIST wapd-0.9-patch1.diff.gz 3091 BLAKE2B 53f9e0bf88a479cd7c3f09cdca4a87aa0988f02fdb2a0dc87a3745fd7d6230685d0c4796ddaafcaa2614efce5f6e8b07c6bbfa11aff93c0e1b2ad0006ca24357 SHA512 16dd9225bd0f40f668317ee8a957c0b113a261fe779931b546634fa8e09de3431359d7b8d3846b4781021438bcc660fc714bf17699dacc94af1fd16885a00450 diff --git a/media-plugins/vdr-wapd/files/confd b/media-plugins/vdr-wapd/files/confd deleted file mode 100644 index b20420fa5ce..00000000000 --- a/media-plugins/vdr-wapd/files/confd +++ /dev/null @@ -1,8 +0,0 @@ -# Global config file for vdr wapd plugin - -# Set the port where the plugin is listen on -# allowed values: port number -# default: 8888 -# -#WAPD_PORT="8888" - diff --git a/media-plugins/vdr-wapd/files/rc-addon.sh b/media-plugins/vdr-wapd/files/rc-addon.sh deleted file mode 100644 index 80cc477f0d0..00000000000 --- a/media-plugins/vdr-wapd/files/rc-addon.sh +++ /dev/null @@ -1,9 +0,0 @@ -# -# rc-addon-script for plugin wapd -# -# Joerg Bornkessel [email protected] - -plugin_pre_vdr_start() { - - add_plugin_param "-p ${WAPD_PORT:=8888}" -} diff --git a/media-plugins/vdr-wapd/files/vdr-wapd-0.9-gentoo.diff b/media-plugins/vdr-wapd/files/vdr-wapd-0.9-gentoo.diff deleted file mode 100644 index 70f7d733f04..00000000000 --- a/media-plugins/vdr-wapd/files/vdr-wapd-0.9-gentoo.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur wapd-0.9.orig/wapd.c wapd-0.9/wapd.c ---- wapd-0.9.orig/wapd.c 2008-01-27 17:38:18.000000000 +0100 -+++ wapd-0.9/wapd.c 2008-01-27 17:40:45.000000000 +0100 -@@ -85,8 +85,8 @@ - bool cPluginWapd::Start(void) - { - RegisterI18n(Phrases); -- if (WapHosts.Load(AddDirectory(ConfigDirectory(), "waphosts"), true) -- && WapAccess.Load(AddDirectory(ConfigDirectory(), "wapaccess"), true) -+ if (WapHosts.Load(AddDirectory(ConfigDirectory( "wapd" ), "waphosts"), true) -+ && WapAccess.Load(AddDirectory(ConfigDirectory( "wapd" ), "wapaccess"), true) - && (server = new cWapServer(tcpport))) - return true; - return false; diff --git a/media-plugins/vdr-wapd/files/vdr-wapd-0.9_gcc-4.1.x.diff b/media-plugins/vdr-wapd/files/vdr-wapd-0.9_gcc-4.1.x.diff deleted file mode 100644 index 1fe4e924506..00000000000 --- a/media-plugins/vdr-wapd/files/vdr-wapd-0.9_gcc-4.1.x.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur wapd-0.9.orig/wappasswd.c wapd-0.9/wappasswd.c ---- wapd-0.9.orig/wappasswd.c 2008-01-27 16:09:43.000000000 +0100 -+++ wapd-0.9/wappasswd.c 2008-01-27 16:12:11.000000000 +0100 -@@ -30,7 +30,7 @@ - { - if (argc != 3) exit(EXIT_FAILURE); - -- char *sset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./"; -+ const char *sset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./"; - char salt[3] = "AA"; - - srand((int) time((time_t *) NULL)); \ No newline at end of file diff --git a/media-plugins/vdr-wapd/files/wapaccess b/media-plugins/vdr-wapd/files/wapaccess deleted file mode 100644 index ca53653a9a5..00000000000 --- a/media-plugins/vdr-wapd/files/wapaccess +++ /dev/null @@ -1,5 +0,0 @@ -# To create a new ''wapaccess'' file with a new user simply type: -# wappasswd username password >> /etc/vdr/plugins/wapd/wapaccess - -# To delete a user from ''wapaccess'' use your favourite text editor -# and remove the line ''username:passwordhash''. diff --git a/media-plugins/vdr-wapd/files/wapd.mk b/media-plugins/vdr-wapd/files/wapd.mk deleted file mode 100644 index 23b93e621f8..00000000000 --- a/media-plugins/vdr-wapd/files/wapd.mk +++ /dev/null @@ -1,108 +0,0 @@ -# -# Makefile for a Video Disk Recorder plugin -# - -# The official name of this plugin. -# This name will be used in the '-P...' option of VDR to load the plugin. -# By default the main source file also carries this name. - -PLUGIN = wapd - -### The version number of this plugin (taken from the main source file): - -VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g') - -### The directory environment: - -# Use package data if installed...otherwise assume we're under the VDR source directory: -PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR = $(call PKGCFG,libdir) -LOCDIR = $(call PKGCFG,locdir) -PLGCFG = $(call PKGCFG,plgcfg) -# -TMPDIR ?= /tmp - -### The compiler options: - -export CFLAGS = $(call PKGCFG,cflags) -export CXXFLAGS = $(call PKGCFG,cxxflags) - -### The version number of VDR's plugin API: - -APIVERSION = $(call PKGCFG,apiversion) - -### Allow user defined options to overwrite defaults: - --include $(PLGCFG) - -### The name of the distribution archive: - -ARCHIVE = $(PLUGIN)-$(VERSION) -PACKAGE = vdr-$(ARCHIVE) - -### The name of the shared object file: - -SOFILE = libvdr-$(PLUGIN).so - -### Includes and Defines (add further entries here): - -INCLUDES += - -DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' - -### Enable this for debugging - -# DEFINES += -DWAPD_DEBUG - -### Enable this to replace WML output with HTML - -# DEFINES += -DWAPD_HTML - -### The object files (add further files here): - -OBJS = $(PLUGIN).o server.o tools.o access.o - -LIBS += -lcrypt - -### The main target: - -all: $(SOFILE) wappasswd - -### Implicit rules: - -%.o: %.c - $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $< - -### Dependencies: - -MAKEDEP = $(CXX) -MM -MG -DEPFILE = .dependencies -$(DEPFILE): Makefile - @$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ - --include $(DEPFILE) - -### Targets: - -$(SOFILE): $(OBJS) - $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ $(LIBS) - -wappasswd: wappasswd.c - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o wappasswd wappasswd.c $(LIBS) - -install-lib: $(SOFILE) - install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) - -install: install-lib - -dist: $(I18Npo) clean - @-rm -rf $(TMPDIR)/$(ARCHIVE) - @mkdir $(TMPDIR)/$(ARCHIVE) - @cp -a * $(TMPDIR)/$(ARCHIVE) - @tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE) - @-rm -rf $(TMPDIR)/$(ARCHIVE) - @echo Distribution package created as $(PACKAGE).tgz - -clean: - @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot - @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ wappasswd diff --git a/media-plugins/vdr-wapd/files/waphosts b/media-plugins/vdr-wapd/files/waphosts deleted file mode 100644 index 9fea92a0f57..00000000000 --- a/media-plugins/vdr-wapd/files/waphosts +++ /dev/null @@ -1,10 +0,0 @@ -# -# waphosts This file describes a number of host addresses that -# are allowed to connect to the port of the vdr-wapd -# plugin running on this system. -# Syntax: -# -# IP-Address[/Netmask] -# - -127.0.0.1 # always accept localhost diff --git a/media-plugins/vdr-wapd/metadata.xml b/media-plugins/vdr-wapd/metadata.xml deleted file mode 100644 index 27f419c289c..00000000000 --- a/media-plugins/vdr-wapd/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 type="project"> -<email>[email protected]</email> -<name>Gentoo VDR Project</name> -</maintainer> -</pkgmetadata> diff --git a/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild b/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild deleted file mode 100644 index 73a058020cf..00000000000 --- a/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit vdr-plugin-2 - -MY_P="${PN}-${PV%_p*}" - -DESCRIPTION="VDR plugin: lets VDR listen to WAP requests on WML enabled browsers" -HOMEPAGE="http://www.heiligenmann.de/"; -SRC_URI="http://www.heiligenmann.de/vdr/download/${MY_P}.tgz - http://www.heiligenmann.de/vdr/download/${MY_P#vdr-}-patch1.diff.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=media-video/vdr-1.3.44" - -PATCHES=("${FILESDIR}/${MY_P}_gcc-4.1.x.diff" - "${FILESDIR}/${MY_P}-gentoo.diff" - "${WORKDIR}/${MY_P#vdr-}-patch1.diff") - -S="${WORKDIR}/${MY_P#vdr-}" - -src_prepare() { - cp "${FILESDIR}/wapd.mk" "${S}/Makefile" - - vdr-plugin-2_src_prepare - - sed -e "s:RegisterI18n://RegisterI18n:" -i wapd.c - vdr_remove_i18n_include server.c wapd.c -} - -src_install() { - vdr-plugin-2_src_install - - dobin "${S}/wappasswd" - - insinto /etc/vdr/plugins/wapd - doins "${FILESDIR}"/{waphosts,wapaccess} -}
