Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

This commit is contained in:
Arne Fitzenreiter
2016-10-03 17:55:42 +02:00
3 changed files with 6 additions and 4 deletions

View File

@@ -10,7 +10,7 @@ usr/bin/idn
#usr/lib/libidn.la #usr/lib/libidn.la
usr/lib/libidn.so usr/lib/libidn.so
usr/lib/libidn.so.11 usr/lib/libidn.so.11
usr/lib/libidn.so.11.5.28 usr/lib/libidn.so.11.6.16
#usr/lib/pkgconfig/libidn.pc #usr/lib/pkgconfig/libidn.pc
#usr/share/emacs #usr/share/emacs
#usr/share/emacs/site-lisp #usr/share/emacs/site-lisp
@@ -19,6 +19,7 @@ usr/lib/libidn.so.11.5.28
#usr/share/info/libidn-components.png #usr/share/info/libidn-components.png
#usr/share/info/libidn.info #usr/share/info/libidn.info
#usr/share/man/man1/idn.1 #usr/share/man/man1/idn.1
#usr/share/man/man3/idn_free.3
#usr/share/man/man3/idna_strerror.3 #usr/share/man/man3/idna_strerror.3
#usr/share/man/man3/idna_to_ascii_4i.3 #usr/share/man/man3/idna_to_ascii_4i.3
#usr/share/man/man3/idna_to_ascii_4z.3 #usr/share/man/man3/idna_to_ascii_4z.3

View File

@@ -0,0 +1 @@
../../../common/libidn

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-2016 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,7 +24,7 @@
include Config include Config
VER = 0.6.14 VER = 1.33
THISAPP = libidn-$(VER) THISAPP = libidn-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 040f012a45feb56168853998bb87ad4d $(DL_FILE)_MD5 = a9aa7e003665de9c82bd3f9fc6ccf308
install : $(TARGET) install : $(TARGET)