From: Michael Tremer Date: Fri, 5 Jan 2018 13:26:33 +0000 (+0000) Subject: Drop mediatomb X-Git-Tag: v2.19-core118~3^2~71 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=fbcb5b749a6e373ca86271232960e4a46b857761 Drop mediatomb This didn't build and run in ages and has been removed from the repositories quite a while ago. Signed-off-by: Michael Tremer --- diff --git a/config/backup/includes/mediatomb b/config/backup/includes/mediatomb deleted file mode 100644 index 87b6a588af..0000000000 --- a/config/backup/includes/mediatomb +++ /dev/null @@ -1 +0,0 @@ -/var/ipfire/mediatomb diff --git a/config/mediatomb/config.xml b/config/mediatomb/config.xml deleted file mode 100644 index adb4ae5b05..0000000000 --- a/config/mediatomb/config.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - MediaTomb - /var/ipfire/mediatomb - /usr/share/mediatomb/web - - - mediatomb.db - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - audio/L16 - no - yes - no - - - - - video/mpeg - yes - yes - yes - - - - - - \ No newline at end of file diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 1e67c36e68..d3a3cf829b 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -92,7 +92,6 @@ etc/rc.d/init.d/wlanclient #etc/rc.d/rc0.d/K01imspetor #etc/rc.d/rc0.d/K01motion #etc/rc.d/rc0.d/K01vdradmin -#etc/rc.d/rc0.d/K02mediatomb #etc/rc.d/rc0.d/K02sslh etc/rc.d/rc0.d/K08fcron etc/rc.d/rc0.d/K28apache @@ -133,7 +132,6 @@ etc/rc.d/rc3.d/S30sshd etc/rc.d/rc3.d/S32apache etc/rc.d/rc3.d/S40fcron #etc/rc.d/rc3.d/S66client175 -#etc/rc.d/rc3.d/S98mediatomb etc/rc.d/rc3.d/S98rc.local #etc/rc.d/rc3.d/S98sslh #etc/rc.d/rc3.d/S99imspetor @@ -143,7 +141,6 @@ etc/rc.d/rc3.d/S98rc.local #etc/rc.d/rc6.d/K01imspetor #etc/rc.d/rc6.d/K01motion #etc/rc.d/rc6.d/K01vdradmin -#etc/rc.d/rc6.d/K02mediatomb #etc/rc.d/rc6.d/K02sslh etc/rc.d/rc6.d/K08fcron etc/rc.d/rc6.d/K28apache diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 760a12869c..67e495c4a7 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -92,7 +92,6 @@ etc/rc.d/init.d/wlanclient #etc/rc.d/rc0.d/K01imspetor #etc/rc.d/rc0.d/K01motion #etc/rc.d/rc0.d/K01vdradmin -#etc/rc.d/rc0.d/K02mediatomb #etc/rc.d/rc0.d/K02sslh etc/rc.d/rc0.d/K08fcron etc/rc.d/rc0.d/K28apache @@ -135,7 +134,6 @@ etc/rc.d/rc3.d/S30sshd etc/rc.d/rc3.d/S32apache etc/rc.d/rc3.d/S40fcron #etc/rc.d/rc3.d/S66client175 -#etc/rc.d/rc3.d/S98mediatomb etc/rc.d/rc3.d/S98rc.local #etc/rc.d/rc3.d/S98sslh #etc/rc.d/rc3.d/S99imspetor @@ -145,7 +143,6 @@ etc/rc.d/rc3.d/S98rc.local #etc/rc.d/rc6.d/K01imspetor #etc/rc.d/rc6.d/K01motion #etc/rc.d/rc6.d/K01vdradmin -#etc/rc.d/rc6.d/K02mediatomb #etc/rc.d/rc6.d/K02sslh etc/rc.d/rc6.d/K08fcron etc/rc.d/rc6.d/K28apache diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 760a12869c..67e495c4a7 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -92,7 +92,6 @@ etc/rc.d/init.d/wlanclient #etc/rc.d/rc0.d/K01imspetor #etc/rc.d/rc0.d/K01motion #etc/rc.d/rc0.d/K01vdradmin -#etc/rc.d/rc0.d/K02mediatomb #etc/rc.d/rc0.d/K02sslh etc/rc.d/rc0.d/K08fcron etc/rc.d/rc0.d/K28apache @@ -135,7 +134,6 @@ etc/rc.d/rc3.d/S30sshd etc/rc.d/rc3.d/S32apache etc/rc.d/rc3.d/S40fcron #etc/rc.d/rc3.d/S66client175 -#etc/rc.d/rc3.d/S98mediatomb etc/rc.d/rc3.d/S98rc.local #etc/rc.d/rc3.d/S98sslh #etc/rc.d/rc3.d/S99imspetor @@ -145,7 +143,6 @@ etc/rc.d/rc3.d/S98rc.local #etc/rc.d/rc6.d/K01imspetor #etc/rc.d/rc6.d/K01motion #etc/rc.d/rc6.d/K01vdradmin -#etc/rc.d/rc6.d/K02mediatomb #etc/rc.d/rc6.d/K02sslh etc/rc.d/rc6.d/K08fcron etc/rc.d/rc6.d/K28apache diff --git a/config/rootfiles/packages/mediatomb.off b/config/rootfiles/packages/mediatomb.off deleted file mode 100644 index fd72752351..0000000000 --- a/config/rootfiles/packages/mediatomb.off +++ /dev/null @@ -1,104 +0,0 @@ -usr/bin/mediatomb -#usr/share/man/man1/mediatomb.1 -#usr/share/mediatomb -#usr/share/mediatomb/js -usr/share/mediatomb/js/common.js -usr/share/mediatomb/js/import.js -usr/share/mediatomb/js/playlists.js -usr/share/mediatomb/mappings.xml -usr/share/mediatomb/mysql.sql -usr/share/mediatomb/sqlite3.sql -#usr/share/mediatomb/web -usr/share/mediatomb/web/cds.xml -usr/share/mediatomb/web/cm.xml -usr/share/mediatomb/web/disabled.html -usr/share/mediatomb/web/favicon.ico -#usr/share/mediatomb/web/icons -usr/share/mediatomb/web/icons/add_as_autoscan.png -usr/share/mediatomb/web/icons/autoscan_inotify_config_folder_open.png -usr/share/mediatomb/web/icons/autoscan_inotify_folder_open.png -usr/share/mediatomb/web/icons/autoscan_timed_config_folder_open.png -usr/share/mediatomb/web/icons/autoscan_timed_folder_open.png -usr/share/mediatomb/web/icons/blank.gif -usr/share/mediatomb/web/icons/blank.png -usr/share/mediatomb/web/icons/document-new.png -usr/share/mediatomb/web/icons/film.png -usr/share/mediatomb/web/icons/folder_new.png -usr/share/mediatomb/web/icons/folder_open.png -usr/share/mediatomb/web/icons/go-first.png -usr/share/mediatomb/web/icons/go-last.png -usr/share/mediatomb/web/icons/go-next.png -usr/share/mediatomb/web/icons/go-previous.png -usr/share/mediatomb/web/icons/mediatomb.png -usr/share/mediatomb/web/icons/mt-icon120.bmp -usr/share/mediatomb/web/icons/mt-icon120.jpg -usr/share/mediatomb/web/icons/mt-icon120.png -usr/share/mediatomb/web/icons/mt-icon32.bmp -usr/share/mediatomb/web/icons/mt-icon32.jpg -usr/share/mediatomb/web/icons/mt-icon32.png -usr/share/mediatomb/web/icons/mt-icon48.bmp -usr/share/mediatomb/web/icons/mt-icon48.jpg -usr/share/mediatomb/web/icons/mt-icon48.png -#usr/share/mediatomb/web/icons/nanotree -#usr/share/mediatomb/web/icons/nanotree/images -usr/share/mediatomb/web/icons/nanotree/images/autoscan_inotify_config_folder_closed.png -usr/share/mediatomb/web/icons/nanotree/images/autoscan_inotify_config_folder_open.png -usr/share/mediatomb/web/icons/nanotree/images/autoscan_inotify_folder_closed.png -usr/share/mediatomb/web/icons/nanotree/images/autoscan_inotify_folder_open.png -usr/share/mediatomb/web/icons/nanotree/images/autoscan_timed_config_folder_closed.png -usr/share/mediatomb/web/icons/nanotree/images/autoscan_timed_config_folder_open.png -usr/share/mediatomb/web/icons/nanotree/images/autoscan_timed_folder_closed.png -usr/share/mediatomb/web/icons/nanotree/images/autoscan_timed_folder_open.png -usr/share/mediatomb/web/icons/nanotree/images/folder_closed.png -usr/share/mediatomb/web/icons/nanotree/images/folder_open.png -usr/share/mediatomb/web/icons/nanotree/images/lastnode.png -usr/share/mediatomb/web/icons/nanotree/images/line.png -usr/share/mediatomb/web/icons/nanotree/images/minus.png -usr/share/mediatomb/web/icons/nanotree/images/minus_last.png -usr/share/mediatomb/web/icons/nanotree/images/minus_last_no_root.png -usr/share/mediatomb/web/icons/nanotree/images/minus_no_root.png -usr/share/mediatomb/web/icons/nanotree/images/plus.png -usr/share/mediatomb/web/icons/nanotree/images/plus_last.png -usr/share/mediatomb/web/icons/nanotree/images/plus_last_no_root.png -usr/share/mediatomb/web/icons/nanotree/images/plus_no_root.png -usr/share/mediatomb/web/icons/nanotree/images/t.png -usr/share/mediatomb/web/icons/nanotree/images/t_no_root.png -usr/share/mediatomb/web/icons/nanotree/images/white.png -usr/share/mediatomb/web/icons/remove_all.png -usr/share/mediatomb/web/icons/remove_autoscan.png -usr/share/mediatomb/web/icons/remove_this.png -usr/share/mediatomb/web/icons/status.png -usr/share/mediatomb/web/icons/status_loading.png -usr/share/mediatomb/web/icons/status_updates_pending.png -usr/share/mediatomb/web/icons/stock-add.png -usr/share/mediatomb/web/icons/stock_edit.png -usr/share/mediatomb/web/icons/stock_exit.png -usr/share/mediatomb/web/index.html -#usr/share/mediatomb/web/js -usr/share/mediatomb/web/js/auth.js -usr/share/mediatomb/web/js/autoscan.js -usr/share/mediatomb/web/js/icons.js -usr/share/mediatomb/web/js/iepngfix.htc -usr/share/mediatomb/web/js/items.js -usr/share/mediatomb/web/js/md5.js -usr/share/mediatomb/web/js/nanotree.js -usr/share/mediatomb/web/js/prototype.js -usr/share/mediatomb/web/js/tasks.js -usr/share/mediatomb/web/js/tools.js -usr/share/mediatomb/web/js/tree.js -usr/share/mediatomb/web/left.html -usr/share/mediatomb/web/main.css -usr/share/mediatomb/web/mr_reg.xml -usr/share/mediatomb/web/right.html -usr/share/mediatomb/web/std_treelook.css -usr/share/mediatomb/web/top.html -usr/share/mediatomb/web/topleft.html -usr/share/mediatomb/web/topright.html -var/ipfire/backup/addons/includes/mediatomb -var/ipfire/mediatomb -#var/ipfire/mediatomb/config.xml -etc/rc.d/init.d/mediatomb -etc/rc.d/rc0.d/K02mediatomb -etc/rc.d/rc6.d/K02mediatomb -etc/rc.d/rc3.d/S98mediatomb -var/mp3/info diff --git a/lfs/initscripts b/lfs/initscripts index 7d07b8ab39..9d3a52c770 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -134,9 +134,6 @@ $(TARGET) : ln -sf ../init.d/random /etc/rc.d/rc3.d/S25random ln -sf ../init.d/random /etc/rc.d/rc6.d/K45random ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local - ln -sf ../init.d/mediatomb /etc/rc.d/rc3.d/S98mediatomb - ln -sf ../init.d/mediatomb /etc/rc.d/rc0.d/K02mediatomb - ln -sf ../init.d/mediatomb /etc/rc.d/rc6.d/K02mediatomb ln -sf ../init.d/client175 /etc/rc.d/rc0.d/K34client175 ln -sf ../init.d/client175 /etc/rc.d/rc3.d/S66client175 ln -sf ../init.d/client175 /etc/rc.d/rc6.d/K34client175 diff --git a/lfs/mediatomb b/lfs/mediatomb deleted file mode 100644 index d7ae4cf6d0..0000000000 --- a/lfs/mediatomb +++ /dev/null @@ -1,93 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.12.1 - -THISAPP = mediatomb-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = mediatomb -PAK_VER = 6 - -DEPS = "ffmpeg libexif taglib " - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = e927dd5dc52d3cfcebd8ca1af6f0d3c2 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make install - cp -Rvd $(DIR_SRC)/config/mediatomb /var/ipfire - chown -R nobody:nobody /var/ipfire/mediatomb - install -v -m 644 $(DIR_SRC)/config/backup/includes/mediatomb \ - /var/ipfire/backup/addons/includes/mediatomb - echo Folder for music files > /var/mp3/info - - #install initscripts - $(call INSTALL_INITSCRIPT,mediatomb) - - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 781590794c..55fb46e66e 100755 --- a/make.sh +++ b/make.sh @@ -1410,7 +1410,6 @@ buildipfire() { lfsmake2 streamripper lfsmake2 sshfs lfsmake2 taglib - #lfsmake2 mediatomb lfsmake2 sslh lfsmake2 perl-gettext lfsmake2 perl-Sort-Naturally diff --git a/src/initscripts/packages/mediatomb b/src/initscripts/packages/mediatomb deleted file mode 100644 index 634e0db0cb..0000000000 --- a/src/initscripts/packages/mediatomb +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/ -# -# Description : mediatomb initscript -# -# Authors : Arne Fitzenreiter -# -# Version : 01.00 -# -# Notes : for www.ipfire.org - GPLv3 -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -case "$1" in - start) - boot_mesg "Starting mediatomb uPnP Mediaserver..." - route add -net 239.0.0.0 netmask 255.0.0.0 green0 - loadproc /usr/bin/mediatomb -u nobody -g nobody \ - -c /var/ipfire/mediatomb/config.xml \ - -l /var/log/mediatomb.log \ - -e green0 $2 $3 $4 $5 $6 $7 -d - evaluate_retval - ;; - - - stop) - boot_mesg "Stopping mediatomb uPnP Mediaserver..." - killproc /usr/bin/mediatomb - evaluate_retval - route del -net 239.0.0.0 netmask 255.0.0.0 green0 - ;; - - restart) - ${0} stop - sleep 1 - ${0} start - - ;; - status) - statusproc /usr/bin/mediatomb - ;; - - *) - echo "Usage: ${0} {start|stop|init|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/ diff --git a/src/paks/mediatomb/install.sh b/src/paks/mediatomb/install.sh deleted file mode 100644 index 682363b5c7..0000000000 --- a/src/paks/mediatomb/install.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -restore_backup ${NAME} diff --git a/src/paks/mediatomb/uninstall.sh b/src/paks/mediatomb/uninstall.sh deleted file mode 100644 index a7b8a5370f..0000000000 --- a/src/paks/mediatomb/uninstall.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service ${NAME} -make_backup ${NAME} -remove_files diff --git a/src/paks/mediatomb/update.sh b/src/paks/mediatomb/update.sh deleted file mode 100644 index 8fae80d986..0000000000 --- a/src/paks/mediatomb/update.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh -/etc/init.d/mediatomb start