webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hinzugefügt:

Browse Source 
* Zaptel Kernelmodule werden gleich komprimiert.
Geändert:
  * Konfigurationspfade sämtlicher Programme von /etc nach /var/ipfire verschoben.
  * Einige Schönheitsfehler IPCop --> IPFire korrigiert.
Gelöscht:
  * wireless herausgenommen. (Bleibt abzuwarten, wann es in IPCop 1.4.11 ist.)


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@130 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-05-22 10:43:28 +00:00
parent 10a04d70a4
commit 5fcb6d5a39
16 changed files with 69 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
doc/ChangeLog
View File

@@ -1,3 +1,17 @@
------------------------------------------------------------------------
r129 | ms | 2006-05-21 22:54:29 +0200 (So, 21 Mai 2006) | 11 lines
Hinzugef<EFBFBD>gt:
* Nochmal ein neues Shutdown-Bild.
* Schnelle Profilauswahl in der index.cgi
* Nettraffic.
* Capiinfo.
Ge<EFBFBD>ndert:
* Men<65> komplett neu sortiert.
* Javascript-Option aus gui.cgi entfernt.
* Pakfire-Fehler beseitigt.
* S<>mtliche /var/ipcop durch /var/ipfire ersetzt.
------------------------------------------------------------------------ ------------------------------------------------------------------------
r128 | ms | 2006-05-20 13:34:29 +0200 (Sa, 20 Mai 2006) | 8 lines r128 | ms | 2006-05-20 13:34:29 +0200 (Sa, 20 Mai 2006) | 8 lines

10
lfs/asterisk
View File

@@ -170,15 +170,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_SRC)/$(BRISTUFF)/zaphfc && make clean linux24 && \ cd $(DIR_SRC)/$(BRISTUFF)/zaphfc && make clean linux24 && \
install -D -m 644 zaphfc.o /lib/modules/$(KVER)/misc/zaphfc.o install -D -m 644 zaphfc.o /lib/modules/$(KVER)/misc/zaphfc.o
# Compress the Kernelmodules
find /lib/modules/$(KVER)/misc/ -name '*.o' -a -type f | xargs gzip -f9
find /lib/modules/$(KVER)-smp/misc/ -name '*.o' -a -type f | xargs gzip -f9
# Build Asterisk # Build Asterisk
cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && patch -Np1 < $(DIR_SRC)/src/patches/asterisk.patch cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && patch -Np1 < $(DIR_SRC)/src/patches/asterisk.patch
### FAX geht noch nicht mit Asterisk 1.2.7.1 ### FAX geht noch nicht mit Asterisk 1.2.7.1
# cp -fv $(DIR_DL)/app_{r,t}xfax.c $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/apps && \ # cp -fv $(DIR_DL)/app_{r,t}xfax.c $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/apps && \
# cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/apps && patch < $(DIR_DL)/apps_Makefile.patch # cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/apps && patch < $(DIR_DL)/apps_Makefile.patch
cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && make clean cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && make clean
cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && make all cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && make all ASTETCDIR=/var/ipfire/asterisk
cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && make install cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && make install ASTETCDIR=/var/ipfire/asterisk
cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && make samples cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && make samples ASTETCDIR=/var/ipfire/asterisk
# Build OH323 # Build OH323
cd $(DIR_SRC)/$(BRISTUFF)/$(OH323) && \ cd $(DIR_SRC)/$(BRISTUFF)/$(OH323) && \

2
lfs/clamav
View File

@@ -75,7 +75,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/clamav cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/clamav
cd $(DIR_APP) && make cd $(DIR_APP) && make
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)

2
lfs/cups
View File

@@ -83,7 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i -e "s@pam/pam@security/pam@g" {config-scripts/cups-pam.m4,scheduler/auth.c,configure} cd $(DIR_APP) && sed -i -e "s@pam/pam@security/pam@g" {config-scripts/cups-pam.m4,scheduler/auth.c,configure}
# cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/patches/cups-1.1.23-testsuite_fix-1.patch # cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/patches/cups-1.1.23-testsuite_fix-1.patch
cd $(DIR_APP) && ./configure --disable-nls cd $(DIR_APP) && ./configure --disable-nls --sysconfdir=/var/ipfire
cd $(DIR_APP) && make cd $(DIR_APP) && make
# cd $(DIR_APP) && make check # cd $(DIR_APP) && make check
cd $(DIR_APP) && make install cd $(DIR_APP) && make install

2
lfs/cyrusimap
View File

@@ -75,7 +75,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --with-auth=unix --with-perl --with-sasl --without-ucdsnmp cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/cyrusimap --with-auth=unix --with-perl --with-sasl --without-ucdsnmp
cd $(DIR_APP) && make depend cd $(DIR_APP) && make depend
cd $(DIR_APP) && make cd $(DIR_APP) && make
cd $(DIR_APP) && make install cd $(DIR_APP) && make install

2
lfs/openldap
View File

@@ -75,7 +75,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/sbin --sysconfdir=/etc --localstatedir=/srv/ldap \ cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/sbin --sysconfdir=/var/ipfire --localstatedir=/srv/ldap \
--disable-debug \ --disable-debug \
--enable-dynamic \ --enable-dynamic \
--enable-crypt \ --enable-crypt \

2
lfs/openvpn
View File

@@ -81,7 +81,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --enable-pthread cd $(DIR_APP) && ./configure --enable-pthread --sysconfdir=/var/ipfire/ovpn
cd $(DIR_APP) && make cd $(DIR_APP) && make
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)

5
lfs/pakfire
View File

@@ -26,8 +26,6 @@
include Config include Config
VER =
THISAPP = pakfire THISAPP = pakfire
DIR_APP = /opt/$(THISAPP) DIR_APP = /opt/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
@@ -54,4 +52,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && mv -vf pakfire.conf /etc cd $(DIR_APP) && mv -vf pakfire.conf /etc
cd $(DIR_APP) && chown root.root $(DIR_APP) -R && chmod 755 pakfire lib/* cd $(DIR_APP) && chown root.root $(DIR_APP) -R && chmod 755 pakfire lib/*
# cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \; # cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \;
@$(POSTBUILD) @$(POSTBUILD)

32
lfs/samba
View File

@@ -83,7 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP)/source && ./configure \ cd $(DIR_APP)/source && ./configure \
--prefix=/usr \ --prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/var/ipfire/samba \
--localstatedir=/var \ --localstatedir=/var \
--with-piddir=/var/run \ --with-piddir=/var/run \
--with-fhs \ --with-fhs \
@@ -101,24 +101,24 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP)/source && ln -v -sf libnss_winbind.so /lib/libnss_winbind.so.2 cd $(DIR_APP)/source && ln -v -sf libnss_winbind.so /lib/libnss_winbind.so.2
cd $(DIR_APP)/source && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2 cd $(DIR_APP)/source && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2
cd $(DIR_APP)/source && install -v -m755 nsswitch/pam_winbind.so /lib/security cd $(DIR_APP)/source && install -v -m755 nsswitch/pam_winbind.so /lib/security
cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /etc/samba cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
# cd $(DIR_APP)/source && install -v -m755 -d /usr/share/doc/samba-3.0.22 # cd $(DIR_APP)/source && install -v -m755 -d /usr/share/doc/samba-3.0.22
# cd $(DIR_APP)/source && install -v -m644 ../docs/*.pdf /usr/share/doc/samba-3.0.22 # cd $(DIR_APP)/source && install -v -m644 ../docs/*.pdf /usr/share/doc/samba-3.0.22
# cd $(DIR_APP)/source && ln -v -s ../../samba/swat /usr/share/doc/samba-3.0.22 # cd $(DIR_APP)/source && ln -v -s ../../samba/swat /usr/share/doc/samba-3.0.22
echo "swat 901/tcp" >> /etc/services echo "swat 901/tcp" >> /etc/services
echo "# Begin /etc/xinetd.d/swat" >> /etc/xinetd.d/swat echo "# Begin /var/ipfire/xinetd.d/swat" >> /var/ipfire/xinetd.d/swat
echo "" >> /etc/xinetd.d/swat echo "" >> /var/ipfire/xinetd.d/swat
echo "service swat" >> /etc/xinetd.d/swat echo "service swat" >> /var/ipfire/xinetd.d/swat
echo "{" >> /etc/xinetd.d/swat echo "{" >> /var/ipfire/xinetd.d/swat
echo " port = 901" >> /etc/xinetd.d/swat echo " port = 901" >> /var/ipfire/xinetd.d/swat
echo " socket_type = stream" >> /etc/xinetd.d/swat echo " socket_type = stream" >> /var/ipfire/xinetd.d/swat
echo " wait = no" >> /etc/xinetd.d/swat echo " wait = no" >> /var/ipfire/xinetd.d/swat
echo " only_from = 127.0.0.1" >> /etc/xinetd.d/swat echo " only_from = 127.0.0.1" >> /var/ipfire/xinetd.d/swat
echo " user = root" >> /etc/xinetd.d/swat echo " user = root" >> /var/ipfire/xinetd.d/swat
echo " server = /usr/sbin/swat" >> /etc/xinetd.d/swat echo " server = /usr/sbin/swat" >> /var/ipfire/xinetd.d/swat
echo " log_on_failure += USERID" >> /etc/xinetd.d/swat echo " log_on_failure += USERID" >> /var/ipfire/xinetd.d/swat
echo "}" >> /etc/xinetd.d/swat echo "}" >> /var/ipfire/xinetd.d/swat
echo "" >> /etc/xinetd.d/swat echo "" >> /var/ipfire/xinetd.d/swat
echo "# End /etc/xinetd.d/swat" >> /etc/xinetd.d/swat echo "# End /var/ipfire/xinetd.d/swat" >> /var/ipfire/xinetd.d/swat
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

2
lfs/sane
View File

@@ -81,7 +81,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-translations && \ cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/sane --disable-translations && \
make make
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)

2
lfs/saslauthd
View File

@@ -96,7 +96,7 @@ else
--with-openssl=/usr --with-openssl=/usr
--without-pgsql \ --without-pgsql \
--with-mysql=/opt/lampp \ --with-mysql=/opt/lampp \
--sysconfdir=/etc \ --sysconfdir=/var/ipfire/sasl \
--with-dbpath=/var/lib/sasl/sasldb2 \ --with-dbpath=/var/lib/sasl/sasldb2 \
--with-saslauthd=/var/run/saslauthd --with-saslauthd=/var/run/saslauthd
endif endif

34
lfs/xinetd
View File

@@ -75,24 +75,24 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --with-loadavg cd $(DIR_APP) && ./configure --prefix=/usr --with-loadavg --sysconfdir=/var/ipfire/xinetd
cd $(DIR_APP) && make cd $(DIR_APP) && make
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
cd $(DIR_APP) && install -v -d -m755 /etc/xinetd.d cd $(DIR_APP) && install -v -d -m755 /var/ipfire/xinetd.d
echo "# Begin /etc/xinetd" > /etc/xinetd.conf echo "# Begin /var/ipfire/xinetd" > /var/ipfire/xinetd.conf
echo "# Configuration file for xinetd" >> /etc/xinetd.conf echo "# Configuration file for xinetd" >> /var/ipfire/xinetd.conf
echo "#" >> /etc/xinetd.conf echo "#" >> /var/ipfire/xinetd.conf
echo "defaults" >> /etc/xinetd.conf echo "defaults" >> /var/ipfire/xinetd.conf
echo "{" >> /etc/xinetd.conf echo "{" >> /var/ipfire/xinetd.conf
echo " instances = 60" >> /etc/xinetd.conf echo " instances = 60" >> /var/ipfire/xinetd.conf
echo " log_type = SYSLOG daemon" >> /etc/xinetd.conf echo " log_type = SYSLOG daemon" >> /var/ipfire/xinetd.conf
echo " log_on_success = HOST PID USERID" >> /etc/xinetd.conf echo " log_on_success = HOST PID USERID" >> /var/ipfire/xinetd.conf
echo " log_on_failure = HOST USERID" >> /etc/xinetd.conf echo " log_on_failure = HOST USERID" >> /var/ipfire/xinetd.conf
echo " cps = 25 30" >> /etc/xinetd.conf echo " cps = 25 30" >> /var/ipfire/xinetd.conf
echo "}" >> /etc/xinetd.conf echo "}" >> /var/ipfire/xinetd.conf
echo "# All service files are stored in the /etc/xinetd.d directory" >> /etc/xinetd.conf echo "# All service files are stored in the /var/ipfire/xinetd.d directory" >> /var/ipfire/xinetd.conf
echo "#" >> /etc/xinetd.conf echo "#" >> /var/ipfire/xinetd.conf
echo "includedir /etc/xinetd.d" >> /etc/xinetd.conf echo "includedir /var/ipfire/xinetd.d" >> /var/ipfire/xinetd.conf
echo "# End /etc/xinetd" >> /etc/xinetd.conf echo "# End /var/ipfire/xinetd" >> /var/ipfire/xinetd.conf
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

2
make.sh
View File

@@ -650,7 +650,7 @@ buildipcop() {
ipcopmake tcpdump ipcopmake tcpdump
ipcopmake traceroute ipcopmake traceroute
ipcopmake vlan ipcopmake vlan
ipcopmake wireless #ipcopmake wireless
ipcopmake libsafe ipcopmake libsafe
ipcopmake 3c5x9setup 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

4
src/rc.d/rc.firewall
View File

@@ -165,9 +165,9 @@ case "$1" in
/sbin/iptables -A INPUT -i $GREEN_DEV -m state --state NEW -j ACCEPT -p ! icmp /sbin/iptables -A INPUT -i $GREEN_DEV -m state --state NEW -j ACCEPT -p ! icmp
/sbin/iptables -A FORWARD -i $GREEN_DEV -m state --state NEW -j ACCEPT /sbin/iptables -A FORWARD -i $GREEN_DEV -m state --state NEW -j ACCEPT
# If a host on orange tries to initiate a connection to IPCop's red IP and # If a host on orange tries to initiate a connection to IPFire's red IP and
# the connection gets DNATed back through a port forward to a server on orange # the connection gets DNATed back through a port forward to a server on orange
# we end up with orange -> orange traffic passing through IPCop # we end up with orange -> orange traffic passing through IPFire
[ "$ORANGE_DEV" != "" ] && /sbin/iptables -A FORWARD -i $ORANGE_DEV -o $ORANGE_DEV -m state --state NEW -j ACCEPT [ "$ORANGE_DEV" != "" ] && /sbin/iptables -A FORWARD -i $ORANGE_DEV -o $ORANGE_DEV -m state --state NEW -j ACCEPT
# accept all traffic from ipsec interfaces # accept all traffic from ipsec interfaces

4
src/rc.d/rc.network
View File

@@ -65,12 +65,12 @@ if [ -d /proc/bus/pccard ]; then
modprobe serial_cb modprobe serial_cb
fi fi
echo "Setting up IPCOP firewall rules" echo "Setting up IPFire firewall rules"
/etc/rc.d/rc.firewall start /etc/rc.d/rc.firewall start
echo "Setting up IP Accounting" echo "Setting up IP Accounting"
/etc/rc.d/helper/writeipac.pl /etc/rc.d/helper/writeipac.pl
/usr/sbin/fetchipac -S /usr/sbin/fetchipac -S
echo "Setting IPCOP DMZ pinholes" echo "Setting IPFire DMZ pinholes"
/usr/local/bin/setdmzholes /usr/local/bin/setdmzholes
if [ "$BLUE_DEV" != "" ]; then if [ "$BLUE_DEV" != "" ]; then

2
src/rc.d/rc.sysinit
View File

@@ -258,7 +258,7 @@ fi
echo "Running rc.local" echo "Running rc.local"
. /etc/rc.d/rc.local . /etc/rc.d/rc.local
logger -t ipcop "IPCop started." logger -t ipfire "IPFire started."
# Send nice startup beep now # Send nice startup beep now
/usr/bin/beep -l 75 -f 500 /usr/bin/beep -l 75 -f 500