From b34fd95d16b55a0006f73612c3b8203677ed1480 Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 20 May 2006 11:34:29 +0000 Subject: [PATCH] =?UTF-8?q?Hinzugef=C3=BCgt:=20=20=20*=20Pakfire=20in=20di?= =?UTF-8?q?e=20ISO=20gepackt.=20(Welche=20nocheinmal=20kleiner=20geworden?= =?UTF-8?q?=20ist.)=20=20=20*=20Neues=20Shutdown-Bild=20Ge=C3=A4ndert:=20?= =?UTF-8?q?=20=20*=20Zahlreiche=20Sch=C3=B6nheitsfehler=20im=20Pakfire=20k?= =?UTF-8?q?orrigiert.=20^^=20Gel=C3=B6scht:=20=20=20*=20Ein=20kleines=20?= =?UTF-8?q?=C3=9Cberbleibsel=20vom=20IPCop=20entfernt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@128 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- doc/ChangeLog | 6 ++++ doc/How-to-make-update | 51 ---------------------------- doc/packages-list.txt | 1 + html/cgi-bin/shutdown.cgi | 4 +-- html/html/images/ipfire_big.gif | Bin 0 -> 29990 bytes lfs/pakfire | 57 ++++++++++++++++++++++++++++++++ make.sh | 11 +++--- src/ROOTFILES.i386 | 5 +++ src/pakfire/lib/check_pak.sh | 12 +++---- src/pakfire/lib/get_conf.sh | 10 +++--- src/pakfire/lib/get_list.sh | 20 +++++------ src/pakfire/lib/get_mirror.sh | 18 +++++----- src/pakfire/lib/get_pak.sh | 4 +-- src/pakfire/lib/get_pakname.sh | 4 +-- src/pakfire/lib/test.sh | 4 +++ src/pakfire/lib/test_host.sh | 4 +-- src/pakfire/lib/unpak_pak.sh | 4 +-- src/pakfire/lib/url_zerl.sh | 4 +-- src/pakfire/pakfire | 6 ++-- src/pakfire/pakfire.conf | 6 ++++ 20 files changed, 129 insertions(+), 102 deletions(-) delete mode 100644 doc/How-to-make-update create mode 100644 html/html/images/ipfire_big.gif create mode 100644 lfs/pakfire diff --git a/doc/ChangeLog b/doc/ChangeLog index aea002c8a..740c32c6c 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +------------------------------------------------------------------------ +r127 | ms | 2006-05-20 11:34:19 +0200 (Sa, 20 Mai 2006) | 3 lines + +Hinzugefügt: + * Erste Version des Pakfire von Peter + ------------------------------------------------------------------------ r126 | ms | 2006-05-19 16:29:15 +0200 (Fr, 19 Mai 2006) | 3 lines diff --git a/doc/How-to-make-update b/doc/How-to-make-update deleted file mode 100644 index 4be2bf379..000000000 --- a/doc/How-to-make-update +++ /dev/null @@ -1,51 +0,0 @@ -Prerequisites -- have release right on sourceforge to be able to affect uploaded files to a release -- have 'IPCop development Group' private gpg key (and password) to sign the patch, import the key with gpg --import (private key file name) -- you can create your own key with whatever name you want and replace (temporarily!) the pub key in - your box (/root/.gnupg/*) for testing your patch - -Build -- ./make.sh changelog and commit : update doc/Changelog (include in the .iso) -- ./make.sh build -- ./make.sh dist : - build source package by exporting from CVS, - create a check-list of modified files in doc/updated-sources.txt -- manually check all necessary files are include in updates/1.4.x/ROOTFILES.*.1.4.x comparing with /doc/updated-sources.txt -- sign the patch with gpg --local-user "IPCop Development Group" --sign ipcop-update-1.4.x.tgz (or with another name given to the key) -- for the announce, files md5 are obtained with md5sum ipcop-* - -Sourceforge -- in case of test files, rename them with rename 1.4.x 1.4.xtest *1.4.x* -- upload files via ftp to upload.sourceforge.net in incoming directory - (may need to have more than 30s inactivity timeout to be able to connect on sourceforge) -- add a new release - for test file, status active under "IPCop test versions" package - for official release, status active under "IPCop" package - affect uploaded files (web interface Files Release System) on the release - add Changelog and text abstract at the release -- control file size under Files web page once files are affected to the package -- with ssh, update every patch list on shell.sourceforge.net /home/groups/i/ip/ipcop/htdocs/patches preceding the previous v1.4.x version with : - the content of updates/1.4x/information (and add the link to the release on sourceforge at the end of the line) -- add a new entry corresponding to the next version number in the patch list with only "----START LIST----" inside - chmod 664 the file -- In Tracker, Tracker administration, bugs, add a new group corresponding to the version number - -Update CVS : -- with the tag of the release - cvs tag IPCOP_v1_4_(x)_FINAL - -- bump VERSION and PREVIOUSTAG in make.sh -- ./make.sh newupdate - will add a new directory in updates corresponding to the new version number with files: - information (Id number should be 003 for VERSION=1.4.3) - ROOTFILES.alpha-1.4.x - ROOTFILES.i386-1.4.x - setup - .cvsignore (containing patch.tar.gz ) - -www.ipcop.org -- update with doc/packages-list.txt - http://www.ipcop.org/modules.php?op=modload&name=phpWiki&file=index&pagename=IPCopSoftwares - -News -- send news on user devel announce lists (subscribe to announce before if necessary) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 3b22776be..73aab0108 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -152,6 +152,7 @@ * openssl-0.9.7i * openswan-1.0.10 * openvpn-2.0.7 + * pakfire * pam_mysql-0.7RC1 * patch-2.5.4 * pciutils-2.1.11 diff --git a/html/cgi-bin/shutdown.cgi b/html/cgi-bin/shutdown.cgi index cd50dd831..6305ca9c6 100644 --- a/html/cgi-bin/shutdown.cgi +++ b/html/cgi-bin/shutdown.cgi @@ -6,8 +6,6 @@ # # (c) The SmoothWall Team # -# $Id: shutdown.cgi,v 1.5.2.10 2006/01/02 16:21:00 eoberlander Exp $ -# use strict; @@ -216,7 +214,7 @@ END
-




+





diff --git a/html/html/images/ipfire_big.gif b/html/html/images/ipfire_big.gif new file mode 100644 index 0000000000000000000000000000000000000000..a43729fb2af152bad4e6eefe6cb8e85690e8dbe8 GIT binary patch literal 29990 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 # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = + +THISAPP = pakfire +DIR_APP = /opt/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +install : $(TARGET) + +check : + +download : + +md5 : + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && cp -fRv src/pakfire $(DIR_APP) + cd $(DIR_APP) && mv -vf pakfire.conf /etc + cd $(DIR_APP) && chown root.root $(DIR_APP) -R && chmod 755 pakfire lib/* + cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \; + @$(POSTBUILD) \ No newline at end of file diff --git a/make.sh b/make.sh index 944b70392..6bf3bebdb 100644 --- a/make.sh +++ b/make.sh @@ -653,7 +653,8 @@ buildipcop() { ipcopmake wireless ipcopmake libsafe ipcopmake 3c5x9setup - echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE + echo -ne "`date -u '+%b %e %T'`: Building ### IPFire modules ### \n" | tee -a $LOGFILE + ipcopmake pakfire ## Zuerst die Libs und dann die Programme. Ordnung muss sein! ipcopmake berkeley ipcopmake BerkeleyDB ## The Perl module @@ -673,7 +674,7 @@ buildipcop() { ipcopmake xinetd ipcopmake ghostscript ipcopmake cups -# ipcopmake lpd +# ipcopmake lpd ## Im Moment aus, da CUPS vorhanden ist. ipcopmake samba ipcopmake sudo ipcopmake mc @@ -681,7 +682,7 @@ buildipcop() { ipcopmake openh323 ipcopmake wget ipcopmake bridge-utils - echo -ne "`date -u '+%b %e %T'`: Building Mailserver \n" | tee -a $LOGFILE + echo -ne "`date -u '+%b %e %T'`: Building ### Mailserver ### \n" | tee -a $LOGFILE ipcopmake postfix ipcopmake fetchmail ipcopmake cyrusimap @@ -690,13 +691,13 @@ buildipcop() { ipcopmake razor ipcopmake spamassassin ipcopmake amavisd - echo -ne "`date -u '+%b %e %T'`: Building VoIP-Server \n" | tee -a $LOGFILE + echo -ne "`date -u '+%b %e %T'`: Building ### VoIP-Server ### \n" | tee -a $LOGFILE ipcopmake stund ipcopmake asterisk ipcopmake openvpn ipcopmake edonkeyclc ipcopmake sane - echo -ne "`date -u '+%b %e %T'`: Building MP3-Server \n" | tee -a $LOGFILE + echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE ipcopmake lame ipcopmake gnump3d ipcopmake rsync diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386 index 6df18cb70..a8088a270 100644 --- a/src/ROOTFILES.i386 +++ b/src/ROOTFILES.i386 @@ -26436,3 +26436,8 @@ usr/sbin/visudo #usr/share/man/man8/sudo.8 #usr/share/man/man8/sudoedit.8 #usr/share/man/man8/visudo.8 +## +## pakfire +## +/opt/pakfire +/etc/pakfire.conf diff --git a/src/pakfire/lib/check_pak.sh b/src/pakfire/lib/check_pak.sh index 4a8b11d87..3e5c4f44e 100644 --- a/src/pakfire/lib/check_pak.sh +++ b/src/pakfire/lib/check_pak.sh @@ -1,26 +1,26 @@ #!/bin/bash ############################################################################################ -# Version 0.1a, Copyright (C) 2006 Peter Schaelchli Für IPFire besteht KEINERLEI GARANTIE;# -# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen; # +# Version 0.1a, Copyright (C) 2006 by IPFire.org # +# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. # ############################################################################################ # Verzeichnis von Pakman VERZ=$(get_conf.sh HOME) -# Update Verzeichnis +# Update-Verzeichnis UP_DIR=$(get_conf.sh UP_DIR) # Verzeichnis mit nicht Installierten Paketen NIP_DIR=$(get_conf.sh NIP_DIR) # Verzeichnis mit Installierten Paketen -IP_DIR=$(get_conf.sh ^IP_DIR) +IP_DIR=$(get_conf.sh IP_DIR) # Patchliste -PATCH_LIST=$(get_conf.sh DEST_DIR)$(get_conf.sh LIST_NAME) +PATCH_LIST=$(get_conf.sh DEST_DIR)/$(get_conf.sh LIST_NAME) # Zerlegte Listen -ZERL_PATCH=$(get_conf.sh DEST_DIR)zerl_ +ZERL_PATCH=$(get_conf.sh DEST_DIR)/zerl_ # Listen Verzeichnis LIST_DIR=$(get_conf.sh DEST_DIR) diff --git a/src/pakfire/lib/get_conf.sh b/src/pakfire/lib/get_conf.sh index 46b6dccd6..ffef70e05 100644 --- a/src/pakfire/lib/get_conf.sh +++ b/src/pakfire/lib/get_conf.sh @@ -1,15 +1,15 @@ #!/bin/bash ############################################################################################ -# Version 0.1a, Copyright (C) 2006 Peter Schaelchli Für IPFire besteht KEINERLEI GARANTIE;# -# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen; # +# Version 0.1a, Copyright (C) 2006 by IPFire.org # +# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. # ############################################################################################ # Conf File festlegen -CONF_File=/opt/pakfire/pakfire.conf +CONF_FILE=/opt/pakfire/pakfire.conf -if [ -r $CONF_File ] +if [ -r $CONF_FILE ] then - STRI=$(grep $1 $CONF_File) + STRI=$(grep $1 $CONF_FILE) STRI=${STRI#*=} fi diff --git a/src/pakfire/lib/get_list.sh b/src/pakfire/lib/get_list.sh index 9fd789cfa..1fa815e2f 100644 --- a/src/pakfire/lib/get_list.sh +++ b/src/pakfire/lib/get_list.sh @@ -1,11 +1,11 @@ #!/bin/bash ############################################################################################ -# Version 0.1a, Copyright (C) 2006 Peter Schaelchli Für IPFire besteht KEINERLEI GARANTIE;# -# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen; # +# Version 0.1a, Copyright (C) 2006 by IPFire.org # +# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. # ############################################################################################ # Verzeichnis von Pakman -VERZ=$(/bin/get_conf.sh HOME) +VERZ=$(get_conf.sh HOME) # Version des IPFire ermitteln VERS=$(get_conf.sh VERS print) @@ -20,7 +20,7 @@ LOG_file=$(get_conf.sh LOG) LIST_NAME=$(get_conf.sh LIST_NAME) # Ziel Verzeichnis -DEST_DIR=$(get_conf.sh DEST_DIR) +DEST_DIR=$(get_conf.sh HOME)/list # Host Tester HOST_TEST=$(get_conf.sh HOST_TEST) @@ -33,27 +33,27 @@ fi # Falls URL nicht gesetzt wurde abbruch des Scripts if [ -z $URL ] - then echo "Kann keinen Patchserver finden">>$LOG_file + then echo "Kann keinen Listenserver finden.">>$LOG_file exit 1 fi # Verzeichnis in Zielverzeichnis wechseln für Download cd $DEST_DIR -# Pruefen ob bereits ein File vorhanden ist falls ja dann wird sie nun gelöscht -if [ -f ${DEST_DIR}${LIST_NAME} ] - then rm ${DEST_DIR}${LIST_NAME} +# Pruefen ob bereits ein File vorhanden ist - falls ja, dann wird sie nun gelöscht +if [ -f ${DEST_DIR}/${LIST_NAME} ] + then rm ${DEST_DIR}/${LIST_NAME} fi # Download der Liste if /usr/bin/wget -q $URL/${VERS}/${LIST_NAME} >/dev/null 2>&1 then cd - - echo "Updateliste herunter geladen von $URL">>$LOG_file + echo "Updateliste heruntergeladen von $URL">>$LOG_file exit 0 else cd - - echo "Updateliste konnnte nicht herunter geladen werden von $URL">>$LOG_file + echo "Updateliste konnnte nicht heruntergeladen werden von $URL">>$LOG_file exit 1 fi diff --git a/src/pakfire/lib/get_mirror.sh b/src/pakfire/lib/get_mirror.sh index 29b6623ed..e12c517c2 100644 --- a/src/pakfire/lib/get_mirror.sh +++ b/src/pakfire/lib/get_mirror.sh @@ -1,27 +1,27 @@ #!/bin/bash ############################################################################################ -# Version 0.1a, Copyright (C) 2006 Peter Schaelchli Für IPFire besteht KEINERLEI GARANTIE;# -# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen; # +# Version 0.1a, Copyright (C) 2006 by IPFire.org # +# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. # ############################################################################################ -# Haupturl +# Haupt-URL http=$(get_conf.sh H_MIRROR) -# Ziel Verzeichnis +# Ziel-Verzeichnis dest=$(get_conf.sh HOME) -# URL Zerleger +# URL-Zerleger URL_ZERL=$(get_conf.sh URL_ZERL) -# Host Tester +# Host-Tester HOST_TEST=$(get_conf.sh HOST_TEST) -# Testen ob Server erreichbar +# Testen ob Server erreichbar ist if ! $HOST_TEST $($URL_ZERL $http get_host) >/dev/null 2>&1 then exit 1 fi -# Verzeichnis wechseln +# Ins Verzeichnis wechseln cd $dest # Überprüfen ob File schon vorhanden ist @@ -29,7 +29,7 @@ if [ -e ${dest}$($URL_ZERL $http get_file) ] then rm ${dest}$($URL_ZERL $http get_file) fi -# File herunter laden +# File herunterladen if /usr/bin/wget -q $http >/dev/null 2>&1 then cd - diff --git a/src/pakfire/lib/get_pak.sh b/src/pakfire/lib/get_pak.sh index 194836810..01c816fc7 100644 --- a/src/pakfire/lib/get_pak.sh +++ b/src/pakfire/lib/get_pak.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################################ -# Version 0.1a, Copyright (C) 2006 Peter Schaelchli Für IPFire besteht KEINERLEI GARANTIE;# -# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen; # +# Version 0.1a, Copyright (C) 2006 by IPFire.org # +# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. # ############################################################################################ # Download Zielverzeichnis diff --git a/src/pakfire/lib/get_pakname.sh b/src/pakfire/lib/get_pakname.sh index 978bfe540..f78dbd748 100644 --- a/src/pakfire/lib/get_pakname.sh +++ b/src/pakfire/lib/get_pakname.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################################ -# Version 0.1a, Copyright (C) 2006 Peter Schaelchli Für IPFire besteht KEINERLEI GARANTIE;# -# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen; # +# Version 0.1a, Copyright (C) 2006 by IPFire.org # +# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. # ############################################################################################ # Update Verzeichnis diff --git a/src/pakfire/lib/test.sh b/src/pakfire/lib/test.sh index 3ce53f751..c7f6763ff 100644 --- a/src/pakfire/lib/test.sh +++ b/src/pakfire/lib/test.sh @@ -1,4 +1,8 @@ #!/bin/bash +############################################################################################ +# Version 0.1a, Copyright (C) 2006 by IPFire.org # +# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. # +############################################################################################ echo $? echo $$ diff --git a/src/pakfire/lib/test_host.sh b/src/pakfire/lib/test_host.sh index 7def31f73..2e8edb8ce 100644 --- a/src/pakfire/lib/test_host.sh +++ b/src/pakfire/lib/test_host.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################################ -# Version 0.1a, Copyright (C) 2006 Peter Schaelchli Für IPFire besteht KEINERLEI GARANTIE;# -# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen; # +# Version 0.1a, Copyright (C) 2006 by IPFire.org # +# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. # ############################################################################################ # URL Zerleger diff --git a/src/pakfire/lib/unpak_pak.sh b/src/pakfire/lib/unpak_pak.sh index 252684bcc..8140c9e30 100644 --- a/src/pakfire/lib/unpak_pak.sh +++ b/src/pakfire/lib/unpak_pak.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################################ -# Version 0.1a, Copyright (C) 2006 Peter Schaelchli Für IPFire besteht KEINERLEI GARANTIE;# -# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen; # +# Version 0.1a, Copyright (C) 2006 by IPFire.org # +# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. # ############################################################################################ # Source Verzeichnis diff --git a/src/pakfire/lib/url_zerl.sh b/src/pakfire/lib/url_zerl.sh index 0da841996..91db43d49 100644 --- a/src/pakfire/lib/url_zerl.sh +++ b/src/pakfire/lib/url_zerl.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################################ -# Version 0.1a, Copyright (C) 2006 Peter Schaelchli Für IPFire besteht KEINERLEI GARANTIE;# -# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen; # +# Version 0.1a, Copyright (C) 2006 by IPFire.org # +# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. # ############################################################################################ protokoll=${1%%:*} diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire index 594ecf17f..af00031aa 100644 --- a/src/pakfire/pakfire +++ b/src/pakfire/pakfire @@ -6,12 +6,12 @@ case "$1" in - renewlist) $(get_conf.sh HOME)/lib/get_mirror.sh + update) $(get_conf.sh HOME)/lib/get_mirror.sh $(get_conf.sh HOME)/lib/get_list.sh $(get_conf.sh HOME)/lib/check_pak.sh - ;; + ;; - *) echo -e "pakfire install [Paket]\npakfire update [Paket]\npakfiren remove [Paket]\npakfire renewlist" + *) echo -e "IPFire - Pakfire\nHilfe:\npakfire install [Paket]\t- Installiert ein neues Paket.\npakfire update\t\t- Lädt die Liste aller Pakete neu.\npakfire remove [Paket]\t- Deinstalliert ein Paket.\npakfire upgrade\t\t- Überprüft nach neuen Updates." esac diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf index e69de29bb..7974f5124 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -0,0 +1,6 @@ +VERS=1.4-beta-1 +HOME=/opt/pakfire +H_MIRROR=http://mirror.ipfire.org/pakfire +HOST_TEST=ping -c 5 +LOG=/var/log/pakfire.log +LIST_NAME=paklist