webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Geaendert:

Browse Source 
* Pakete haben jetzt die Endung .ipfire
  * Kleiner Logikfehler im ConnScheduler

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@264 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-08-30 18:29:15 +00:00
parent 8a7ededb09
commit d535503d95
8 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/ChangeLog
View File

@@ -1,4 +1,8 @@
------------------------------------------------------------------------
r263 | delaco | 2006-08-30 15:10:09 +0200 (Wed, 30 Aug 2006) | 1 line
Typo in der Make.sh, die die LibMAD nicht bauen lies. Sorry :(
------------------------------------------------------------------------
r262 | delaco | 2006-08-29 23:23:05 +0200 (Tue, 29 Aug 2006) | 1 line
IPCop-Source 1.4.11 eingefuegt

4
langs/de/cgi-bin/de.pl
View File

@@ -1510,8 +1510,8 @@
'ConnSched scheduler' => 'Scheduler',
'ConnSched select profile' => 'Wähle Profil',
'ConnSched up' => 'Hoch',
'ConnSched ipsecstart' => 'VPN (re)start',
'ConnSched ipsecstop' => 'VPN stop',
'ConnSched ipsecstart' => 'IPSec (neu)starten',
'ConnSched ipsecstop' => 'IPSec stop',
);

4
langs/en/cgi-bin/en.pl
View File

@@ -1543,7 +1543,7 @@
'ConnSched scheduler' => 'Scheduler',
'ConnSched select profile' => 'Select profile',
'ConnSched up' => 'Up',
'ConnSched ipsecstart' => 'VPN (re)start',
'ConnSched ipsecstop' => 'VPN stop',
'ConnSched ipsecstart' => 'IPSec (re)start',
'ConnSched ipsecstop' => 'IPSec stop',
);

2
make.sh
View File

@@ -916,7 +916,7 @@ ipfirepackages() {
# ipfiredist xinetd
ipfiredist xvid
test -d $BASEDIR/packages || mkdir $BASEDIR/packages
mv -f $LFS/install/packages/*.{tar.gz,md5} $BASEDIR/packages >> $LOGFILE 2>&1
mv -f $LFS/install/packages/*.{ipfire,md5} $BASEDIR/packages >> $LOGFILE 2>&1
rm -rf $BASEDIR/build/install/packages/*
}

2
src/pakfire/lib/get_list.sh
View File

@@ -6,7 +6,7 @@
get_list () {
PURL=`cat $CACHE_DIR/$SERVERS_LIST`
PURL=`cat ${CACHE_DIR}$SERVERS_LIST`
if [ "$PURL" ]; then
url=$(. $HOST_TEST "$PURL")

10
src/pakfire/lib/get_mirror.sh
View File

@@ -7,15 +7,17 @@ get_mirror() {
cd $PAKHOME/cache
if [ -e $PAKHOME/cache/$SERVERS_LIST ]
then rm -f $PAKHOME/cache/$SERVERS_LIST
fi
#if [ -e $PAKHOME/cache/$SERVERS_LIST ]
# then rm -f $PAKHOME/cache/$SERVERS_LIST
#fi
if /usr/bin/wget -q $H_MIRROR >/dev/null 2>&1
if /usr/bin/wget $H_MIRROR >$LOG 2>&1
then
pakfire_logger "Got servers!"
cd -
return 0
else
pakfire_logger "Got no servers!"
cd -
return 1
fi

4
src/pakfire/lib/get_pak.sh
View File

@@ -15,7 +15,7 @@ fi
. $DB_DIR/$1
FILE="$1-${VER}_${IPFVER}.tar.gz"
FILE="$1-${VER}_${IPFVER}.ipfire"
if [ ! -f $CACHE_DIR/$FILE ]; then
cd /var/tmp
@@ -24,7 +24,7 @@ if [ ! -f $CACHE_DIR/$FILE ]; then
then
if [ "`md5sum $FILE`" = "`cat ${FILE}.md5`" ]; then
mv -f /var/tmp/$FILE{,.md5} $CACHE_DIR
pakfire_logger "MD5 sum OK!"
pakfire_logger "MD5 sum OK in $FILE!"
else
pakfire_logger "Wrong MD5 sum in $FILE."
rm -f /var/tmp/$FILE{,.md5}

7
src/scripts/packager
View File

@@ -3,6 +3,7 @@
PROG="$1"
VER="$2"
PAK_VER="$3"
EXT=ipfire
if [ -f /install/packages/$PROG-$VER-$PAK_VER.tar.gz.empty ]; then
@@ -25,10 +26,10 @@ else
cd / && rm -rf /tmp/*
cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES
tar cfz ../$PROG-${VER}_$PAK_VER.tar.gz files.tgz install.sh uninstall.sh ROOTFILES depends.txt
tar cvz ../$PROG-${VER}_$PAK_VER.$EXT files.tgz install.sh uninstall.sh ROOTFILES depends.txt
cd /install/packages && md5sum $PROG*.tar.gz > $PROG-${VER}_$PAK_VER.tar.gz.md5
cd /install/packages && md5sum $PROG*.tar.gz >> all-progs.md5
cd /install/packages && md5sum $PROG*.$EXT > $PROG-${VER}_$PAK_VER.$EXT.md5
cd /install/packages && md5sum $PROG*.$EXT >> all-progs.md5
rm -rf /install/packages/package
exit 0
fi