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

wget: Update to 1.14.

Browse Source
This commit is contained in:
Erik Kapfer
2013-12-23 17:38:41 +01:00
committed by Michael Tremer
parent 5c3da078b3
commit 55e16317fd
3 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/rootfiles/common/wget
View File

@@ -1,5 +1,4 @@
#etc/wgetrc
usr/bin/wget usr/bin/wget
#usr/etc #usr/share/info/wget.info
#usr/etc/wgetrc #usr/share/man/man1/wget.1
#usr/info/wget.info
#usr/man/man1/wget.1

23
lfs/wget
View File

@@ -1,7 +1,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt # # Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -24,10 +24,10 @@
include Config include Config
VER = 1.10.2 VER = 1.14
THISAPP = wget-$(VER) THISAPP = wget-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE) DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 795fefbb7099f93e2d346b026785c4b8 $(DL_FILE)_MD5 = 316f6f59292c9098ad81fd54f658c579
install : $(TARGET) install : $(TARGET)
@@ -69,10 +69,19 @@ $(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 Jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --with-ssl \
--disable-nls --disable-ipv6 cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/wget-1.14-texi2pod-1.patch
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--sysconfdir=/etc \
--with-ssl=openssl \
--disable-nls \
--disable-ipv6
cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

32
src/patches/wget-1.14-texi2pod-1.patch Normal file
View File

@@ -0,0 +1,32 @@
Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
Date: 2013-06-18
Initial Package Version: 1.14
Upstream Status: Submitted
Origin: Arch
Description: Build with perl-5.18.
http://lists.gnu.org/archive/html/bug-wget/2013-06/msg00046.html
From 2ed1707b5d8be66feb80cccfe8e11e719b52b99a Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Mon, 17 Jun 2013 23:31:46 +0530
Subject: [PATCH] Fix error in texi2pod intriduced with Perl 5.18
---
diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl
index 86c4b18..9db6de1 100755
--- a/doc/texi2pod.pl
+++ b/doc/texi2pod.pl
@@ -291,7 +291,7 @@ while(<$inf>) {
if (defined $1) {
my $thing = $1;
if ($ic =~ /\@asis/) {
- $_ = "\n=item $thing\n";
+ $_ = "\n=item C<$thing>\n";
} else {
# Entity escapes prevent munging by the <> processing below.
$_ = "\n=item $ic\&LT;$thing\&GT;\n";
--
1.8.3.1