From c3bbdb219f6fb68b916720d8dbd8e2d6503347ee Mon Sep 17 00:00:00 2001 From: ms Date: Sun, 14 Oct 2007 20:49:19 +0000 Subject: [PATCH] Den cyrus-imapd umbenannt. Die Abhaengigkeiten von openmailadmin angepasst. Moblock erstmal raus bis wir damit beginnen. Begonnen die Pakfire-functions.sh zu erweitern. Cups soll automatisch starten. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@973 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- .../packages/{cyrusimap => cyrus-imapd} | 0 config/rootfiles/packages/moblock | 1 - lfs/{cyrusimap => cyrus-imapd} | 4 +- lfs/moblock | 83 ------------------- lfs/openmailadmin | 2 +- src/pakfire/lib/functions.sh | 48 +++++++++-- src/paks/cups/install.sh | 10 +++ src/paks/cups/uninstall.sh | 5 ++ src/paks/cups/update.sh | 4 + src/paks/default/install.sh | 2 + src/paks/default/uninstall.sh | 4 + 11 files changed, 67 insertions(+), 96 deletions(-) rename config/rootfiles/packages/{cyrusimap => cyrus-imapd} (100%) delete mode 100644 config/rootfiles/packages/moblock rename lfs/{cyrusimap => cyrus-imapd} (98%) delete mode 100644 lfs/moblock create mode 100644 src/paks/cups/install.sh create mode 100644 src/paks/cups/uninstall.sh create mode 100644 src/paks/cups/update.sh diff --git a/config/rootfiles/packages/cyrusimap b/config/rootfiles/packages/cyrus-imapd similarity index 100% rename from config/rootfiles/packages/cyrusimap rename to config/rootfiles/packages/cyrus-imapd diff --git a/config/rootfiles/packages/moblock b/config/rootfiles/packages/moblock deleted file mode 100644 index 878e5a0993..0000000000 --- a/config/rootfiles/packages/moblock +++ /dev/null @@ -1 +0,0 @@ -usr/bin/moblock diff --git a/lfs/cyrusimap b/lfs/cyrus-imapd similarity index 98% rename from lfs/cyrusimap rename to lfs/cyrus-imapd index 8f87ea1925..1cfddab513 100644 --- a/lfs/cyrusimap +++ b/lfs/cyrus-imapd @@ -31,10 +31,10 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = cyrusimap +PROG = cyrus-imapd PAK_VER = 1 -DEPS = "cyrus-sasl mysql" +DEPS = "cyrus-sasl" ############################################################################### # Top-level Rules diff --git a/lfs/moblock b/lfs/moblock deleted file mode 100644 index 99a7782a48..0000000000 --- a/lfs/moblock +++ /dev/null @@ -1,83 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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.8 - -THISAPP = MoBlock-$(VER) -DL_FILE = $(THISAPP)-i586.tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = moblock -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 199967adb48b153be90db10fe21325c5 - -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 jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/openmailadmin b/lfs/openmailadmin index 272f2d67d4..147595d162 100644 --- a/lfs/openmailadmin +++ b/lfs/openmailadmin @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = openmailadmin PAK_VER = 1 -DEPS = "cyrusimap postfix" +DEPS = "cyrus-imapd postfix mysql" ############################################################################### # Top-level Rules diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index 6d23ecf646..6fa682ee88 100644 --- a/src/pakfire/lib/functions.sh +++ b/src/pakfire/lib/functions.sh @@ -19,21 +19,20 @@ # # ############################################################################### +. /etc/sysconfig/rc +. $rc_functions + extract_files() { echo "Extracting files..." tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / echo "...Finished." } -reload_libs() { - echo "(Re-)Initializing the lib-cache..." - ldconfig -vv - echo "...Finished." -} - -reload_modules() { - echo "(Re-)Initializing the module-dependencies..." - depmod -va +remove_files() { + echo "Removing files..." + for i in $(cat /opt/pakfire/tmp/ROOTFILES); do + rm -rfv ${i} + done echo "...Finished." } @@ -42,3 +41,34 @@ restart_service() { /etc/init.d/$1 restart } + +start_service() { + DELAY=0 + while true + case "${1}" in + --delay|-d) + DELAY=${2} + shift 2 + ;; + --background|-b) + BACKGROUND="&" + shift + ;; + -*) + log_failure_msg "Unknown Option: ${1}" + return 2 #invalid or excess argument(s) + ;; + *) + break + ;; + esac + + [ -e "/etc/init.d/${1}" ] && \ + (sleep ${DELAY} && /etc/init.d/${1} start ${BACKGROUND}) +} + +stop_service() { + + [ -e "/etc/init.d/${1}" ] && /etc/init.d/${1} stop + +} diff --git a/src/paks/cups/install.sh b/src/paks/cups/install.sh new file mode 100644 index 0000000000..19bbcae22d --- /dev/null +++ b/src/paks/cups/install.sh @@ -0,0 +1,10 @@ +#!/bin/bash +. /opt/pakfire/lib/functions.sh + +extract_files + +sleep 300 && /etc/init.d/cups start & + +ln -svf ../init.d/cups /etc/rc.d/rc0.d/K00cups +ln -svf ../init.d/cups /etc/rc.d/rc3.d/S25cups +ln -svf ../init.d/cups /etc/rc.d/rc6.d/K00cups diff --git a/src/paks/cups/uninstall.sh b/src/paks/cups/uninstall.sh new file mode 100644 index 0000000000..4b637d0717 --- /dev/null +++ b/src/paks/cups/uninstall.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +/etc/init.d/cups stop + +rm -rf /etc/rc.d/rc*.d/*cups diff --git a/src/paks/cups/update.sh b/src/paks/cups/update.sh new file mode 100644 index 0000000000..a47a7831dc --- /dev/null +++ b/src/paks/cups/update.sh @@ -0,0 +1,4 @@ +#!/bin/bash +. /opt/pakfire/lib/functions.sh + +extract_files diff --git a/src/paks/default/install.sh b/src/paks/default/install.sh index a47a7831dc..14973a9986 100644 --- a/src/paks/default/install.sh +++ b/src/paks/default/install.sh @@ -2,3 +2,5 @@ . /opt/pakfire/lib/functions.sh extract_files + +start_service --delay 60 --background ${NAME} diff --git a/src/paks/default/uninstall.sh b/src/paks/default/uninstall.sh index e69de29bb2..c12adf92c4 100644 --- a/src/paks/default/uninstall.sh +++ b/src/paks/default/uninstall.sh @@ -0,0 +1,4 @@ +#!/bin/bash +. /opt/pakfire/lib/functions.sh + +stop_service ${NAME} -- 2.39.2