Source-Links gefixt.

Domainumzug vom Source-Code.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@390 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/lfs/Config b/lfs/Config
index a66406c65d80d9c05f947273da7e6d4dc73aa910..cae476e0b0d188e77dddb18fd40e888d377d1233 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -13,8 +13,8 @@
 # URLs that are common sources of downloads.  If you're having trouble with
 # a site you should change its URL to that of a suitable mirror site.
 #
-URL_IPFIRE  = http://source.ipfire.eu/othersrc
-URL_TOOLCHAIN = http://source.ipfire.eu/toolchain
+URL_IPFIRE  = http://source.ipfire.org/othersrc
+URL_TOOLCHAIN = http://source.ipfire.org/toolchain
 URL_IPCOP   = http://ipcop.ath.cx
 
 # Default compiler optimizations.

diff --git a/lfs/HTML-Parser b/lfs/HTML-Parser
index 42017f4f8c3ed696212eef1eb3ea16e30f89d821..f0909c1265c70a8b8389ba473a68ae9d1db3a8c0 100644 (file)
--- a/lfs/HTML-Parser
+++ b/lfs/HTML-Parser
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: HTML-Parser,v 1.1.2.2 2005/07/07 22:31:30 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 3.45
 
 THISAPP    = HTML-Parser-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_CPAN)/HTML
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/HTML-Tagset b/lfs/HTML-Tagset
index 5de13d6aaeab2fc2199a5a8a11a2cfe038f68dbb..2ab433696f6718360182ee8ca64992904f1d6c76 100644 (file)
--- a/lfs/HTML-Tagset
+++ b/lfs/HTML-Tagset
@@ -36,7 +36,7 @@ VER        = 3.04
 
 THISAPP    = HTML-Tagset-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_CPAN)/HTML
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/MIME-Tools b/lfs/MIME-Tools
index 224a4012c4a96b1df2bcdbfc643184ba24ec4e69..ce050a66dfbbe7094a9236a893536081bed3ddc6 100644 (file)
--- a/lfs/MIME-Tools
+++ b/lfs/MIME-Tools
@@ -30,7 +30,7 @@ VER        = 5.420
 
 THISAPP    = MIME-tools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -52,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-#dist: 
-#      make-packages.sh MIME-Tools $(THISAPP)-ipfire-beta-1
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################

diff --git a/lfs/Net-DNS b/lfs/Net-DNS
index 33f67501fe34930770e2e38c3dc3c8b8966c71ef..129f47827caa08fb76bc3be62cc1c26b10c56bbb 100644 (file)
--- a/lfs/Net-DNS
+++ b/lfs/Net-DNS
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: Net-DNS,v 1.5.2.3 2005/02/05 15:38:14 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 0.47
 
 THISAPP    = Net-DNS-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_CPAN)/Net
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/Net-IPv4Addr b/lfs/Net-IPv4Addr
index ae1b6c2b0fe31c4b5570cfd704e38ffdd5eb873e..05bbb7efdc73444a3b69e52461e4bbab8dc6a04f 100644 (file)
--- a/lfs/Net-IPv4Addr
+++ b/lfs/Net-IPv4Addr
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: Net-IPv4Addr,v 1.3.2.2 2005/02/05 15:38:14 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 0.10
 
 THISAPP    = Net-IPv4Addr-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_CPAN)/Net
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/Net_SSLeay b/lfs/Net_SSLeay
index 8dd78845ecdb48b42d0382bc7a85510ebacfa998..e3f6dc6f2ef16b49355af985a00994b04147a7c1 100644 (file)
--- a/lfs/Net_SSLeay
+++ b/lfs/Net_SSLeay
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: Net_SSLeay,v 1.1.2.1 2005/07/08 00:03:18 franck78 Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 1.25
 
 THISAPP    = Net_SSLeay.pm-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_CPAN)/Net/SAMPO
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/URI b/lfs/URI
index de1b0bed16261f54581c197a642b550cfeb70a35..06ca141ca81d666cf1c14dc0a908887411758ba8 100644 (file)
--- a/lfs/URI
+++ b/lfs/URI
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: URI,v 1.1.2.2 2005/07/07 22:31:30 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 1.35
 
 THISAPP    = URI-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_CPAN)/URI
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/Unix-Syslog b/lfs/Unix-Syslog
index 16cd94058e3b63e8eab82076224550abd730c562..87658433e9d69ec94e9676d1cb60dcfe71d8c2a3 100644 (file)
--- a/lfs/Unix-Syslog
+++ b/lfs/Unix-Syslog
@@ -30,7 +30,7 @@ VER        = 0.100
 
 THISAPP    = Unix-Syslog-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://search.cpan.org/CPAN/authors/id/M/MH/MHARNISCH
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -52,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-#dist: 
-#      make-packages.sh Unix-Syslog $(THISAPP)-ipfire-beta-1
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################

diff --git a/lfs/ed b/lfs/ed
index 91dfd6132e3ed255df27ca788a63dbaa600a0ce9..521697dcb9aee060ab3aa46680334b935b531664 100644 (file)
--- a/lfs/ed
+++ b/lfs/ed
@@ -40,7 +40,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 objects = $(DL_FILE) $(THISAPP)-mkstemp-1.patch
 
 $(DL_FILE)                     = $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-mkstemp-1.patch     = $(URL_LFS)/ed/$(THISAPP)-mkstemp-1.patch
+$(THISAPP)-mkstemp-1.patch     = $(DL_FROM)/$(THISAPP)-mkstemp-1.patch
 
 $(DL_FILE)_MD5                 = ddd57463774cae9b50e70cd51221281b
 $(THISAPP)-mkstemp-1.patch_MD5 = e7e2248f9baa76de3db8210298e0d79e

diff --git a/lfs/ethtool b/lfs/ethtool
index d0476328fe3998d901e892735f11a441e5271849..992d0a7b07a08e1496efbe475f5361bc04a62b8e 100644 (file)
--- a/lfs/ethtool
+++ b/lfs/ethtool
@@ -30,7 +30,7 @@ VER        = 3
 
 THISAPP    = ethtool-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/gkernel
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/grub b/lfs/grub
index c82d220cd947e4296ad134245dd310b3427da4ac..743d01ce48a3f3c62657b326df57a30fabe164a7 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -30,7 +30,7 @@ VER        = 0.97
 
 THISAPP    = grub-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_AGNU)/grub
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 CFLAGS     =

diff --git a/lfs/kbd b/lfs/kbd
index ac7c91c112435a0353cabedf8b4429f3d85fdb39..a0d6f65b8c07c8f4a8d00148adda6fedada1748f 100644 (file)
--- a/lfs/kbd
+++ b/lfs/kbd
@@ -44,7 +44,7 @@ endif
 objects = $(DL_FILE) $(THISAPP)-more-programs-1.patch
 
 $(DL_FILE)                            = $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-more-programs-1.patch      = $(URL_LFS)/kbd/$(THISAPP)-more_programs-1.patch
+$(THISAPP)-more-programs-1.patch      = $(DL_FROM)/kbd-$(VER)-more-programs-1.patch
 
 $(DL_FILE)_MD5                        = 069d1175b4891343b107a8ac2b4a39f6
 $(THISAPP)-more-programs-1.patch_MD5  = dc70180a6bc0afa2b741cd38e3cc2e18

diff --git a/lfs/libcap b/lfs/libcap
index 8a7e132921dfc578b15c438eac23e9efe076e3f6..d3c26045bd07c4d65da2adc7ba6092f8e7269b94 100644 (file)
--- a/lfs/libcap
+++ b/lfs/libcap
@@ -30,7 +30,7 @@ VER        = 1.10
 
 THISAPP    = libcap-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_KERNEL)/linux/libs/security/linux-privs/kernel-2.4
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/libwww-perl b/lfs/libwww-perl
index aaf0bbb2dd6aa0d27ecd969a5862927415472a1e..cb1671a629fcbbcb04cccbc770ba228894d4c080 100644 (file)
--- a/lfs/libwww-perl
+++ b/lfs/libwww-perl
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: libwww-perl,v 1.1.2.2 2005/07/07 22:31:30 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 5.803
 
 THISAPP    = libwww-perl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_CPAN)/Net
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/linux-atm b/lfs/linux-atm
index 07bdf8a288a799ee4a1a7dfab80716125a56587f..fc48b4d1c917d6f333d962d83436fc789b50afcc 100644 (file)
--- a/lfs/linux-atm
+++ b/lfs/linux-atm
@@ -30,7 +30,7 @@ VER        = 2.4.1
 
 THISAPP    = linux-atm-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/linux-atm
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/makedev b/lfs/makedev
deleted file mode 100644 (file)
index 87defd4..0000000
--- a/lfs/makedev
+++ /dev/null
@@ -1,136 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop 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 2 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop 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 IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: makedev,v 1.11.2.4 2006/09/06 05:33:17 gespinasse Exp $
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.2
-
-THISAPP    = make_devices-$(VER)
-DL_FILE    = $(THISAPP).bz2
-DL_FROM    = $(URL_LFS_FTP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 2863fbe7f5953efb5a0d0a840e1e9d21
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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)
-       cd /dev && bzcat $(DIR_DL)/$(DL_FILE) > make_devices
-       cd /dev && chmod 754 make_devices
-       cd /dev && patch -Np0 < $(DIR_SRC)/src/patches/make_devices.patch
-       cd /dev && ./make_devices
-       # ipsec
-       cd /dev && rm -f ipsec
-       cd /dev && mknod ipsec c 36 10
-       chmod 200 /dev/ipsec
-
-       # tap/tun
-       cd /dev/net && rm -f tun
-       cd /dev/net && mknod tun c 10 200
-
-       # PULSARDSL Devices
-       cd /dev && rm -f ttyG0
-       cd /dev && mknod ttyG0 c 43 0
-       cd /dev && rm -f cug0
-       cd /dev && mknod cug0  c 44 0
-
-       # ISDN Symlink + Permissions
-       cd /dev && ln -sf isdnctrl0 isdnctrl
-
-       # isdninfo
-       cd /dev && rm -f isdninfo
-       cd /dev && mknod isdninfo c 45 255
-       chown root:nobody /dev/isdninfo
-       chmod 640 /dev/isdninfo
-
-       # USB HID Dev
-       -mkdir /dev/usb
-       for i in `seq 0 7`; do \
-           rm -f /dev/usb/hiddev$$i; \
-           mknod /dev/usb/hiddev$$i c 180 $$(( 96 + $$i )); \
-       done
-
-       # USB ACM Modems
-       for i in `seq 0 7`; do \
-           rm -f /dev/usb/ttyACM$$i; \
-           mknod /dev/usb/ttyACM$$i c 166 $$i; \
-       done
-
-       # Wanpipe
-       for i in `seq 0 7`; do \
-           rm -f /dev/ttyWP$$i; \
-           mknod -m 666 /dev/ttyWP$$i c 240 $$i; \
-       done
-
-       # Add a symlink to the default floppy dev. updfstab will change it to USB if
-       # necessary, but it must be present if it appears in /etc/mtab
-       cd /dev && ln -sf fd0 floppy
-
-       # Nodes for Framebuffer
-       for i in `seq 0 7` 12; do \
-               rm -f /dev/fb$$; \
-               mknod /dev/fb$$i c 29 $$(($$i * 32)); \
-       done
-
-       @$(POSTBUILD)

diff --git a/lfs/ndiswrapper b/lfs/ndiswrapper
index 099e35d1dbffd087e170a63489ad8882a4d8b55d..0f9ab66194e2d226bd8c40c946aa1415b16c6507 100644 (file)
--- a/lfs/ndiswrapper
+++ b/lfs/ndiswrapper
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Alan Hourihane <alanh@fairlite.demon.co.uk>                      #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ndiswrapper,v 1.1.2.3 2006/01/30 01:50:14 franck78 Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 1.8
 
 THISAPP    = ndiswrapper-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/ndiswrapper
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -80,6 +74,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && make KSRC=/usr/src/linux KVERS=$(KVER)
        cd $(DIR_APP) && make KSRC=/usr/src/linux KVERS=$(KVER) install
-       gzip -f /lib/modules/$(KVER)/misc/ndiswrapper.o
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/newt b/lfs/newt
index 41e66c71c2f6082ad1005be141517244543984f0..ab9a4b99e2f9760693b4396799b929c7ca5f24be 100644 (file)
--- a/lfs/newt
+++ b/lfs/newt
@@ -45,7 +45,7 @@ endif
 objects = $(DL_FILE) $(THISAPP)-9.6.diff.gz
 
 $(DL_FILE)                 = $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-9.6.diff.gz     = $(URL_DEBIAN)/n/newt-utf8/$(THISAPP)-9.6.diff.gz
+$(THISAPP)-9.6.diff.gz     = $(DL_FROM)/$(THISAPP)-9.6.diff.gz
 
 $(DL_FILE)_MD5             = 4079546c307475ef2508dd2e98ed505e
 $(THISAPP)-9.6.diff.gz_MD5 = 5f1522189bdb16622677ad8e52f93119

diff --git a/lfs/oinkmaster b/lfs/oinkmaster
index d4f1ce9cf4b436a726e88a88cb99286eb3f2c079..0ea75527469e01df44e87bd967e02d94f75d8442 100644 (file)
--- a/lfs/oinkmaster
+++ b/lfs/oinkmaster
@@ -30,7 +30,7 @@ VER        = 1.2
 
 THISAPP    = oinkmaster-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/oinkmaster
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/openh323 b/lfs/openh323
index cecb78a1414ef854546321aa59e7b332fe45bf7d..19708176ab69d62eb4e391ea20cc3762a7cbd503 100644 (file)
--- a/lfs/openh323
+++ b/lfs/openh323
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = Mimas_patch2
 
 THISAPP    = openh323-$(VER)
 DL_FILE    = $(THISAPP)-src-tar.gz
-DL_FROM    = $(URL_SFNET)/openh323
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/openh323
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/pkg-config b/lfs/pkg-config
index 82be8d8f2245ba25080546c086cee803102f0e98..12624d9eba75ee02d4a625f98eef56334faa9ab0 100644 (file)
--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 0.20
 
 THISAPP    = pkg-config-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://pkgconfig.freedesktop.org/releases
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -58,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
-       make-packages.sh postfix $(THISAPP)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################

diff --git a/lfs/razor b/lfs/razor
index 8da2a877be869fab79173d139489d6fd597d9cc4..779b0c05cf55812bd9a4f5326b4d63d7fe0b21d8 100644 (file)
--- a/lfs/razor
+++ b/lfs/razor
@@ -30,7 +30,7 @@ VER        = 2.81
 
 THISAPP    = razor-agents-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_SFNET)/razor
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -55,9 +55,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
-       make-packages.sh razor $(THISAPP)-ipfire-beta-1
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -83,5 +80,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC) && tar jxf $(DIR_DL)/razor-agents-sdk-2.07.tar.bz2
        cd $(DIR_SRC)/razor-agents-sdk-2.07 && perl Makefile.PL
        cd $(DIR_SRC)/razor-agents-sdk-2.07 && make && make install
-       @rm -rf $(DIR_APP)
+       @rm -rf $(DIR_APP) $(DIR_SRC)/razor-agents-sdk-*
        @$(POSTBUILD)

diff --git a/lfs/setserial b/lfs/setserial
index 3f97c82ec7b15660661104115ba8526ce6491b2f..de3e1564aa3fe7b0398564d35395fd4258ce2138 100644 (file)
--- a/lfs/setserial
+++ b/lfs/setserial
@@ -30,7 +30,7 @@ VER        = 2.17
 
 THISAPP    = setserial-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/setserial
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 

diff --git a/lfs/speedycgi b/lfs/speedycgi
deleted file mode 100644 (file)
index c4c0baf..0000000
--- a/lfs/speedycgi
+++ /dev/null
@@ -1,85 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop 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 2 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop 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 IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: speedycgi,v 1.1.2.3 2005/06/22 22:32:20 gespinasse Exp $
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2.22
-
-THISAPP    = CGI-SpeedyCGI-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/speedycgi
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 2f80df78874e3efa80f180923c4967a1
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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 zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && yes 'n' | perl Makefile.PL
-       cd $(DIR_APP) && make
-       cd $(DIR_APP) && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/lfs/startscripts b/lfs/startscripts
deleted file mode 100644 (file)
index 67e4f7a..0000000
--- a/lfs/startscripts
+++ /dev/null
@@ -1,59 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop 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 2 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop 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 IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = ipfire
-
-THISAPP    = startscripts
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-install : $(TARGET)
-
-check :
-
-download :
-
-md5 :
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       test -d /etc/init.d || mkdir /etc/init.d
-       cd $(DIR_SRC)/src/init.d && cp -fv * /etc/init.d
-       chown root.root /etc/init.d/*
-       chmod 755 /etc/init.d/*
-       for i in applejuice asterisk cups cyrus-sasl gnump3d nfs-server postfix samba winbind xinetd; do ln -vfs /etc/init.d/$$i /usr/local/bin/rc$$i; done
-       rm -f /usr/local/bin/rcinit-functions
-       @$(POSTBUILD)
\ No newline at end of file

diff --git a/lfs/subversion b/lfs/subversion
deleted file mode 100644 (file)
index 90e0420..0000000
--- a/lfs/subversion
+++ /dev/null
@@ -1,88 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop 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 2 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop 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 IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.3.1
-
-THISAPP    = subversion-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = subversion
-PAK_VER    = 1
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 07b95963968ae345541ca99d0e7bf082
-
-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) && ./configure --prefix=/usr \
-                               --without-berkeley-db \
-                               --with-installbuilddir=/usr/lib/apr-0 \
-                               --with-ssl --disable-nls \
-                               --disable-mod-activation
-       cd $(DIR_APP) && make
-       cd $(DIR_APP) && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/lfs/tcpwrapper b/lfs/tcpwrapper
index fc5915592f45ed942c5d5826e4079e16b845aeae..49c2e49010da772507a375bb85406c0c25739b4b 100644 (file)
--- a/lfs/tcpwrapper
+++ b/lfs/tcpwrapper
@@ -18,7 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -31,7 +30,7 @@ VER        = 7.6
 
 THISAPP    = tcp_wrappers_$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.porcupine.org/pub/security
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -53,8 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
-       make-packages.sh tcpwrapper $(THISAPP)-ipfire-beta-1
 
 ###############################################################################
 # Downloading, checking, md5sum

diff --git a/make.sh b/make.sh
index 045898b3e52fab46549cb53b1617f0f64d189491..60eb20a30d74ab7612d8502b4e0be518688833cc 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -371,7 +371,6 @@ buildipfire() {
   ipfiremake openldap
   ipfiremake apache2
   ipfiremake php
-  ipfiremake subversion
   ipfiremake apache2                   PASS=C
   ipfiremake arping
   ipfiremake beep
@@ -451,7 +450,6 @@ buildipfire() {
   ipfiremake libsafe
   ipfiremake 3c5x9setup
   ipfiremake pakfire
-  ipfiremake startscripts
   ipfiremake java
   ipfiremake bootsplash
   ipfiremake spandsp