From 1ee8bf5d7ffd66528922412c95d126e5d50812b0 Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 17 Feb 2007 22:00:37 +0000 Subject: [PATCH] Maniacikarus Samba.cgi eingespielt mISDN eingebaut git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@423 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/kernel/kernel.config.i586 | 29 +- config/kernel/kernel.config.i586.smp | 29 +- config/rootfiles/common/configroot | 1 + doc/packages-list.txt | 1 + html/cgi-bin/samba.cgi | 584 ++++++++++++++++++++------- lfs/linux | 13 +- make.sh | 2 +- 7 files changed, 497 insertions(+), 162 deletions(-) diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586 index 94e4f9687c..c91e82d224 100644 --- a/config/kernel/kernel.config.i586 +++ b/config/kernel/kernel.config.i586 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16 -# Sun Feb 4 15:26:41 2007 +# Thu Feb 15 06:11:38 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -1356,13 +1356,26 @@ CONFIG_ISDN_DRV_AVMB1_C4=m # # Active Eicon DIVA Server cards # -CONFIG_CAPI_EICON=y -CONFIG_ISDN_DIVAS=m -CONFIG_ISDN_DIVAS_BRIPCI=y -CONFIG_ISDN_DIVAS_PRIPCI=y -CONFIG_ISDN_DIVAS_DIVACAPI=m -CONFIG_ISDN_DIVAS_USERIDI=m -CONFIG_ISDN_DIVAS_MAINT=m +# CONFIG_CAPI_EICON is not set + +# +# Modular ISDN driver +# +CONFIG_MISDN_DRV=m +# CONFIG_MISDN_MEMDEBUG is not set +CONFIG_MISDN_AVM_FRITZ=y +CONFIG_MISDN_NETJET=y +CONFIG_MISDN_HFCPCI=y +# CONFIG_MISDN_HFCMULTI is not set +# CONFIG_HFCMULTI_PCIMEM is not set +CONFIG_MISDN_HFCUSB=y +CONFIG_MISDN_HFCMINI=y +CONFIG_MISDN_XHFC=y +CONFIG_MISDN_SPEEDFAX=y +CONFIG_MISDN_W6692=y +CONFIG_MISDN_DSP=y +CONFIG_MISDN_LOOP=y +CONFIG_MISDN_L1OIP=y # # Telephony Support diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp index a3a7c55731..34109f1e57 100644 --- a/config/kernel/kernel.config.i586.smp +++ b/config/kernel/kernel.config.i586.smp @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16 -# Sun Feb 4 15:27:11 2007 +# Thu Feb 15 06:11:51 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -1356,13 +1356,26 @@ CONFIG_ISDN_DRV_AVMB1_C4=m # # Active Eicon DIVA Server cards # -CONFIG_CAPI_EICON=y -CONFIG_ISDN_DIVAS=m -CONFIG_ISDN_DIVAS_BRIPCI=y -CONFIG_ISDN_DIVAS_PRIPCI=y -CONFIG_ISDN_DIVAS_DIVACAPI=m -CONFIG_ISDN_DIVAS_USERIDI=m -CONFIG_ISDN_DIVAS_MAINT=m +# CONFIG_CAPI_EICON is not set + +# +# Modular ISDN driver +# +CONFIG_MISDN_DRV=m +# CONFIG_MISDN_MEMDEBUG is not set +CONFIG_MISDN_AVM_FRITZ=y +CONFIG_MISDN_NETJET=y +CONFIG_MISDN_HFCPCI=y +# CONFIG_MISDN_HFCMULTI is not set +# CONFIG_HFCMULTI_PCIMEM is not set +CONFIG_MISDN_HFCUSB=y +CONFIG_MISDN_HFCMINI=y +CONFIG_MISDN_XHFC=y +CONFIG_MISDN_SPEEDFAX=y +CONFIG_MISDN_W6692=y +CONFIG_MISDN_DSP=y +CONFIG_MISDN_LOOP=y +CONFIG_MISDN_L1OIP=y # # Telephony Support diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 5c638d54bd..d799dc8035 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -62,6 +62,7 @@ var/ipfire/main #var/ipfire/main/settings var/ipfire/mbmon #var/ipfire/mbmon/settings +var/ipfire/menu.d var/ipfire/modem #var/ipfire/modem/defaults #var/ipfire/modem/settings diff --git a/doc/packages-list.txt b/doc/packages-list.txt index ca1bea7b2f..059e01f3c7 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -142,6 +142,7 @@ * libwww-perl-5.803 * libxml2-2.6.26 * linux-2.6.16.29-ipfire +* linux-2.6.16.29-ipfire-smp_old * linux-atm-2.4.1 * linux-libc-headers-2.6.12.0 * linuxigd-0.95 diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index d70f87ab9b..05be43f203 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -25,9 +25,16 @@ my $errormessage = ""; my $shareentry = ""; my @shares = (); my @shareline = (); +my $shareconfigentry = ""; +my @sharesconfig = (); +my @shareconfigline = (); +my $userentry = ""; +my @user = (); +my @userline = (); my @proto = (); my %selected= () ; my $sharefile = "/var/ipfire/samba/shares"; +my $userfile = "/var/ipfire/samba/private/smbpasswd"; &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); &General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings); @@ -40,22 +47,22 @@ my %servicenames = &Header::showhttpheaders(); -$sambasettings{'ENABLED'} = 'off'; -$sambasettings{'EDIT'} = 'no'; -$sambasettings{'VALID'} = 'yes'; $sambasettings{'WORKGRP'} = 'homeip.net'; $sambasettings{'NETBIOSNAME'} = 'IPFIRE'; -$sambasettings{'SRVSTRING'} = 'Samba Server %v running on IPFire 2.0'; -$sambasettings{'INTERFACES'} = 'eth0'; +$sambasettings{'SRVSTRING'} = 'Samba Server running on IPFire 2.0'; +$sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'share'; -$sambasettings{'OSLEVEL'} = '20'; -$sambasettings{'PDC'} = 'off'; +$sambasettings{'OSLEVEL'} = '65'; $sambasettings{'GREEN'} = 'on'; $sambasettings{'BLUE'} = 'off'; $sambasettings{'ORANGE'} = 'off'; $sambasettings{'VPN'} = 'off'; -$sambasettings{'WINSSERV'} = ''; -$sambasettings{'WINS'} = 'off'; +$sambasettings{'WINSSRV'} = "$netsettings{'GREEN_NETADDRESS'}"; +$sambasettings{'WINSSUPPORT'} = 'off'; +$sambasettings{'OTHERINTERFACES'} = ''; +$sambasettings{'GUESTACCOUNT'} = 'samba'; +$sambasettings{'MAPTOGUEST'} = 'Never'; +$sambasettings{'BINDINTERFACESONLY'} = 'True'; ### Values that have to be initialized $sambasettings{'ACTION'} = ''; @@ -68,47 +75,112 @@ $sambasettings{'ACTION'} = ''; ############################################################################################################################ ############################################################################################################################ -if ($sambasettings{'ACTION'} eq $Lang::tr{'save'}) +if ($sambasettings{'ACTION'} eq 'smbuserdisable'){system('/usr/local/bin/sambactrl 1 $sambasettings{"NAME"}');} +if ($sambasettings{'ACTION'} eq 'smbuserenable'){system('/usr/local/bin/sambactrl 2 $sambasettings{"NAME"}');} +if ($sambasettings{'ACTION'} eq 'smbuserdelete'){system('/usr/local/bin/sambactrl 3 $sambasettings{"NAME"}');} +if ($sambasettings{'ACTION'} eq 'smbuseradd'){system('/usr/local/bin/sambactrl 4 $username $password');} +if ($sambasettings{'ACTION'} eq 'smbchangepw'){system('/usr/local/bin/sambactrl 5 $username $password');} +if ($sambasettings{'ACTION'} eq 'smbsharechange'){system('/usr/local/bin/sambactrl 7 $sambasettings{"SHARENAME"} $sambasettings{"SHAREOPTION"}');} +if ($sambasettings{'ACTION'} eq 'smbstart'){system('/usr/local/bin/sambactrl 8');} +if ($sambasettings{'ACTION'} eq 'smbstop'){system('/usr/local/bin/sambactrl 9');} + +############################################################################################################################ +############################################## Samba Share neu anlegen ##################################################### + +if ($sambasettings{'ACTION'} eq 'smbshareadd') { - &General::writehash("${General::swroot}/samba/settings", \%sambasettings); + my $emptyline= ""; + system('/usr/local/bin/sambactrl 6'); + open (FILE, ">>${General::swroot}/samba/shares") or die "Can't save the shares settings: $!"; + flock (FILE, 2); + +print FILE <${General::swroot}/samba/global") or die "Can't save the global settings: $!"; + flock (FILE, 2); + +print FILE <$errormessage\n"; print " \n"; &Header::closebox(); -} + } + +$checked{'WINSSUPPORT'}{$sambasettings{'WINSSUPPORT'}} = "checked='checked' "; +$checked{'GREEN'}{$sambasettings{'GREEN'}} = "checked='checked' "; +$checked{'BLUE'}{$sambasettings{'BLUE'}} = "checked='checked' "; +$checked{'ORANGE'}{$sambasettings{'ORANGE'}} = "checked='checked' "; +$checked{'VPN'}{$sambasettings{'VPN'}} = "checked='checked' "; -$checked{'PDC'}{'on'} = ''; -$checked{'PDC'}{'off'} = ''; -$checked{'PDC'}{"$sambasettings{'PDC'}"} = 'checked'; -$checked{'WINS'}{'on'} = ''; -$checked{'WINS'}{'off'} = ''; -$checked{'WINS'}{"$sambasettings{'WINS'}"} = 'checked'; -$checked{'GREEN'}{'on'} = ''; -$checked{'GREEN'}{'off'} = ''; -$checked{'GREEN'}{"$sambasettings{'GREEN'}"} = 'checked'; -$checked{'BLUE'}{'on'} = ''; -$checked{'BLUE'}{'off'} = ''; -$checked{'BLUE'}{"$sambasettings{'BLUE'}"} = 'checked'; -$checked{'ORANGE'}{'on'} = ''; -$checked{'ORANGE'}{'off'} = ''; -$checked{'ORANGE'}{"$sambasettings{'ORANGE'}"} = 'checked'; -$checked{'VPN'}{'on'} = ''; -$checked{'VPN'}{'off'} = ''; -$checked{'VPN'}{"$sambasettings{'VPN'}"} = 'checked'; - -$selected{'MAPTOGUEST'}{'Never'} = ''; -$selected{'MAPTOGUEST'}{'Bad User'} = ''; -$selected{'MAPTOGUEST'}{'Bad Password'} = ''; $selected{'MAPTOGUEST'}{$sambasettings{'MAPTOGUEST'}} = "selected='selected'"; -$selected{'SECURITY'}{'share'} = ''; -$selected{'SECURITY'}{'user'} = ''; -$selected{'SECURITY'}{'server'} = ''; -$selected{'SECURITY'}{'domain'} = ''; $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'"; ############################################################################################################################ @@ -116,25 +188,25 @@ $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'"; &Header::openbox('100%', 'center', 'Samba'); print < +
+
END ; if ( $message ne "" ) { - print " +
$message"; + print "
$message"; } - - my $lines = 0; +print <Alle Dienste
+END +; my $key = ''; foreach $key (sort keys %servicenames) { - if ($lines % 2) { - print "\n"; } - else { - print "\n"; } - print "\n"; + print ""; print <
@@ -142,155 +214,381 @@ END END ; - print "\n"; - $lines++; } print < -
$key
$key"; my $shortname = $servicenames{$key}; my $status = &isrunning($shortname); - print "$status\n"; + print "$status
Alle Dienste: +
+ -
-
-
+
+
- - + + + +
-
-
Basisoptionen -
Workgroup: -
NetBIOS-Name: -
Server-String: -
Interfaces: OpenVpn - $ovpnsettings{'DDEVICE'} -
$Lang::tr{'green'} - $netsettings{'GREEN_DEV'} +
+ + + + + + END ; if (&Header::blue_used()){ print < END ; } if (&Header::orange_used()){ print < END ; } print < - + + + + + + + + + + + +
Basisoptionen
Workgroup:
NetBIOS-Name:
Server-String:
Interfaces: OpenVpn - $ovpnsettings{'DDEVICE'}
$Lang::tr{'green'} - $netsettings{'GREEN_DEV'}
$Lang::tr{'wireless'} - $netsettings{'BLUE_DEV'} +
$Lang::tr{'wireless'} - $netsettings{'BLUE_DEV'}
$Lang::tr{'dmz'} - $netsettings{'ORANGE_DEV'} +
$Lang::tr{'dmz'} - $netsettings{'ORANGE_DEV'}
-
-
Sicherheitsoptionen -
Security: - -
-
-
Browsingoptionen -
OS Level: -
Primary Domain Controller:on / - off - -
-
-
WINS-Optionen -
WINS-Server: -
WINS-Support:on / - off - -
+
weitere

Sicherheitsoptionen
Security:
Map to guest:

Browsingoptionen
OS Level:

WINS-Optionen
WINS-Server:
WINS-Support:on / + off
END ; &Header::closebox(); -&Header::openbox('100%', 'center', 'Shares'); +if ($sambasettings{'SECURITY'} eq 'user') +{ +&Header::openbox('100%', 'center', 'accounting - user Security'); print < - - + + + + +
Name der FreigabePfadOptionen +
+
+ END ; - open( FILE, "< $sharefile" ) or die "Unable to read $sharefile"; - @shares = ; - close FILE; - foreach $shareentry (sort @shares) + open( FILE, "< $userfile") or die "Can't read user file: $!"; + @user = ; + close(FILE); + foreach $userentry (sort @user) { - @shareline = split( /\;/, $shareentry ); - print < + END ; } print <
+
Benutzerverwaltung +
BenutzernamePasswortStatusOptionen
$shareline[0] - $shareline[2] - - + @userline = split( /\:/, $userentry ); + print < +END +; + }else{ + print < + +END +; + } + print <
+ + - - +
$userline[0] END ; - if ($shareline[1] eq 'enabled') { - print <
- - - -
+ if ($userline[2] =~ m/N/){ + print <		 END ; - } elsif ($shareline[1] eq 'disabled') { - print <
- - - -
+ }else{ + print <		 END ; - } - print <
- - + } + if ($userline[2] =~ m/D/){ + print < +
+ + + +
+ + + +
- - +
+ + -
-
+
Legende:   Freigabe bearbeiten |  Freigabe loeschen   +
+
+ + +
+ +
+ +
+
+END +; +if ($sambasettings{'ACTION'} eq 'usercaption') +{ + print <
+
Legende:
Benutzer neu anlegen
Benutzer aktivieren
Benutzer deaktivieren
Passwort wechseln
Benutzer loeschen
END ; +} + +if ($sambasettings{'ACTION'} eq 'userchangepw') +{ + my $username = "$sambasettings{'NAME'}"; + my $password = 'samba'; + print < +
+
+ + + + +
Passwort wechseln
Benutzername
Passwort
+END +; +} +if ($sambasettings{'ACTION'} eq 'useradd') +{ + my $username = "User"; + my $password = 'samba'; + print < +
+
+ + + + +
Benutzer neu anlegen
Benutzername
Passwort
+END +; +} &Header::closebox(); +} + +&Header::openbox('100%', 'center', 'Shares'); +print < +
+ +END +; + my @Zeilen; + my @Shares; + @shares = `grep -n '^\\[' $sharefile`; + foreach $shareentry (@shares) + { + @shareline = split( /\:/, $shareentry ); + push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]); + } + + foreach $shareentry (sort @Shares) + { + print < + + +END +; + } + print < -if ($sambasettings{'SECURITY'} eq 'user') +
Shareverwaltung +
Names des SharesOptionen
$shareentry
+ + + +
+ + + +

+ + +
+ +
+ +
+
+END +; +if ($sambasettings{'ACTION'} eq 'sharecaption') { -&Header::openbox('100%', 'center', 'User'); + print <
+
Legende:
Share neu anlegen
Share bearbeiten
Share loeschen
+END +; +} -print < - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
Benutzerverwaltung +if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optioncaption' ) +{ + +my $defaultoption= "[Share]\npath = /shares/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\nguest ok = yes\npublic = yes\nforce user = samba"; + + print < +
+ + + + + + +
neuen Share anlegen
Anzeige der Optionen fuer Shares +
+
+
END ; +} -&Header::closebox(); +if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'optioncaption2' ) +{ + my $sharename = "$sambasettings{'NAME'}"; + my $shareoption = ''; + chomp $sharename; + $sharename=~s/\s//g; + + for(my $i = 0; $i <= $#Shares; $i++) + { + chomp $Shares[$i]; + $Shares[$i]=~s/\s//g; + if ( "$Shares[$i]" eq "$sharename" ) + { + my $Zeilenbegin = $Zeilen[$i+1]-2; + my $Zeilenende = $Zeilen[$i+1]-$Zeilen[$i]; + my $EOF = qx(cat $sharefile | wc -l); + if ( $Zeilen[$i] eq $Zeilen[$#Shares] ) + {$Zeilenende = $EOF-$Zeilen[$#Shares]+1;$Zeilenbegin = $EOF-$Zeilen[$#Shares]; $shareoption = qx(tail -$Zeilenende $sharefile | head -$Zeilenbegin);} + else{$shareoption = qx(head -$Zeilenbegin $sharefile | tail -$Zeilenende);} + } + } + + print < +
+ + + + + + +
Share bearbeiten
Anzeige der Optionen fuer Shares +
+
+ +
+END +; } +if ($sambasettings{'ACTION'} eq 'optioncaption' || $sambasettings{'ACTION'} eq 'optioncaption2') +{ + print <
+
Legende:
OptionBedeutung / Beispiel
commentKommentar
comment = Mein neues Share

pathPfad zum Verzeichnis
path = /share/neu

writeableVerzeichnis schreibbar
writeable = yes

browseablesichtbar in Verzeichnisliste
browsable = yes

userBesitzer der Freigabe
user = samba

valid usersListe der Zugriffsberechtigten
valid users = samba, user1

write listListe der Schreibberechtigten
write list = samba

read listListe der nur Leseberechtigten
read list = user1

admin usersListe der Benutzer mit SuperUser Rechten
admin users = user1

invalid usersListe der Benutzer denen der Zugriff verweigert wird
invalid users = user2

force userStandartbenutzer fuer alle Dateien
force user = samba

directory maskUNIX Verzeichnisberchtigung beim Erzeugen
directory mask = 0777

create maskUNIX Dateiberchtigung beim Erzeugen
create mask = 0777

guest okAnnonymer Zugriff
guest ok = yes
+END +; +} + +&Header::closebox(); &Header::closebigbox(); &Header::closepage(); @@ -300,7 +598,7 @@ END sub isrunning { my $cmd = $_[0]; - my $status = "$Lang::tr{'stopped'}"; + my $status = "$Lang::tr{'stopped'}"; my $pid = ''; my $testcmd = ''; my $exename; @@ -322,10 +620,10 @@ sub isrunning close FILE; if ($testcmd =~ /$exename/) { - $status = "$Lang::tr{'running'}"; + $status = "$Lang::tr{'running'}"; } } } return $status; -} +} \ No newline at end of file diff --git a/lfs/linux b/lfs/linux index 98e3d5c260..86994180f3 100644 --- a/lfs/linux +++ b/lfs/linux @@ -48,6 +48,7 @@ endif # Top-level Rules ############################################################################### objects =$(DL_FILE) \ + mISDN-CVS-2007-01-26.tar.bz2 \ squashfs3.0.tar.gz \ openswan-2.4.7.kernel-2.6-natt.patch.gz \ openswan-2.4.7.kernel-2.6-klips.patch.gz \ @@ -70,6 +71,7 @@ net4801.kernel.patch_2.4.31 = $(URL_IPFIRE)/net4801.kernel.patch_2.4.31 netfilter-layer7-v2.6.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.6.tar.gz patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 squashfs3.0.tar.gz = $(URL_IPFIRE)/squashfs3.0.tar.gz +mISDN-CVS-2007-01-26.tar.bz2 = $(URL_IPFIRE)/mISDN-CVS-2007-01-26.tar.bz2 $(DL_FILE)_MD5 = 50695965725367f39007023feac5e256 patch-$(PATCHLEVEL).gz_MD5 = 1355ebc25ea57df398d20e1c1726ec9b @@ -82,6 +84,7 @@ net4801.kernel.patch_2.4.31_MD5 = c7d64e3caedb2f2b10e1c11db7f73a04 netfilter-layer7-v2.6.tar.gz_MD5 = 58135cd1aafaf4ae2fa478159206f064 patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 squashfs3.0.tar.gz_MD5 = 9fd05d0bfbb712f5fb95edafea5bc733 +mISDN-CVS-2007-01-26.tar.bz2_MD5 = 844c70dc851faffcae7549fd738c7b49 install : $(TARGET) @@ -147,9 +150,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_SRC)/patch-o-matic-ng* && \ ./runme --batch --kernel-path=$(ROOT)/usr/src/$(THISAPP)/ --iptables-path=$(ROOT)/usr/src/iptables/ \ TARPIT sip-conntrack-nat rtsp-conntrack-nat \ - mms-conntrack-nat #quake3-conntrack-nat + mms-conntrack-nat # Layer7-patch + cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.6 cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.6.tar.gz cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.6/for_older_kernels/kernel-2.6.13-2.6.16-layer7-2.2.patch @@ -159,6 +163,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # ip_conntrack permissions from 440 to 444 cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch + # mISDN + cd $(DIR_SRC) && rm -rf mISDN-CVS-2007-01-26 + cd $(DIR_SRC) && tar xfj $(DIR_DL)/mISDN-CVS-2007-01-26.tar.bz2 + cd $(DIR_SRC)/mISDN-CVS-2007-01-26 && yes 'yes' | ./std2kern -k /usr/src/linux + ifeq "$(SMP)" "" # Only do this once on the non-SMP pass cd $(DIR_SRC) && tar czf $(DIR_DL)/iptables-fixed.tar.gz iptables-1.3.5 @@ -210,5 +219,5 @@ endif ifeq "$(SMP)" "1" rm -rf /lib/modules/$(VER)-smp/pcmcia endif - @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* + @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-CVS-2007-01-26 $(DIR_SRC)/netfilter-layer7-v2.6 @$(POSTBUILD) diff --git a/make.sh b/make.sh index e7493fda87..f69547dac5 100644 --- a/make.sh +++ b/make.sh @@ -170,7 +170,7 @@ prepareenv() { # Setup environment set +h LC_ALL=POSIX - MAKETUNING="-j12" + MAKETUNING="-j4" export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD -- 2.39.2