Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

config/rootfiles/common/curl

@@ -2,61 +2,72 @@
 #usr/bin/curl-config
 #usr/include/curl
 #usr/include/curl/curl.h
+#usr/include/curl/curlbuild.h
+#usr/include/curl/curlrules.h
 #usr/include/curl/curlver.h
 #usr/include/curl/easy.h
 #usr/include/curl/mprintf.h
 #usr/include/curl/multi.h
 #usr/include/curl/stdcheaders.h
+#usr/include/curl/typecheck-gcc.h
 #usr/include/curl/types.h
 #usr/lib/libcurl.a
 #usr/lib/libcurl.la
 usr/lib/libcurl.so
-usr/lib/libcurl.so.3
-usr/lib/libcurl.so.3.0.0
+usr/lib/libcurl.so.4
+usr/lib/libcurl.so.4.1.1
 #usr/lib/pkgconfig/libcurl.pc
-#usr/man/man1/curl-config.1
-#usr/man/man1/curl.1
-#usr/man/man3/curl_easy_cleanup.3
-#usr/man/man3/curl_easy_duphandle.3
-#usr/man/man3/curl_easy_getinfo.3
-#usr/man/man3/curl_easy_init.3
-#usr/man/man3/curl_easy_perform.3
-#usr/man/man3/curl_easy_reset.3
-#usr/man/man3/curl_easy_setopt.3
-#usr/man/man3/curl_easy_strerror.3
-#usr/man/man3/curl_escape.3
-#usr/man/man3/curl_formadd.3
-#usr/man/man3/curl_formfree.3
-#usr/man/man3/curl_free.3
-#usr/man/man3/curl_getdate.3
-#usr/man/man3/curl_getenv.3
-#usr/man/man3/curl_global_cleanup.3
-#usr/man/man3/curl_global_init.3
-#usr/man/man3/curl_global_init_mem.3
-#usr/man/man3/curl_mprintf.3
-#usr/man/man3/curl_multi_add_handle.3
-#usr/man/man3/curl_multi_cleanup.3
-#usr/man/man3/curl_multi_fdset.3
-#usr/man/man3/curl_multi_info_read.3
-#usr/man/man3/curl_multi_init.3
-#usr/man/man3/curl_multi_perform.3
-#usr/man/man3/curl_multi_remove_handle.3
-#usr/man/man3/curl_multi_strerror.3
-#usr/man/man3/curl_share_cleanup.3
-#usr/man/man3/curl_share_init.3
-#usr/man/man3/curl_share_setopt.3
-#usr/man/man3/curl_share_strerror.3
-#usr/man/man3/curl_slist_append.3
-#usr/man/man3/curl_slist_free_all.3
-#usr/man/man3/curl_strequal.3
-#usr/man/man3/curl_unescape.3
-#usr/man/man3/curl_version.3
-#usr/man/man3/curl_version_info.3
-#usr/man/man3/libcurl-easy.3
-#usr/man/man3/libcurl-errors.3
-#usr/man/man3/libcurl-multi.3
-#usr/man/man3/libcurl-share.3
-#usr/man/man3/libcurl-tutorial.3
-#usr/man/man3/libcurl.3
-#usr/share/curl
-#usr/share/curl/curl-ca-bundle.crt
+#usr/share/man/man1/curl-config.1
+#usr/share/man/man1/curl.1
+#usr/share/man/man3/curl_easy_cleanup.3
+#usr/share/man/man3/curl_easy_duphandle.3
+#usr/share/man/man3/curl_easy_escape.3
+#usr/share/man/man3/curl_easy_getinfo.3
+#usr/share/man/man3/curl_easy_init.3
+#usr/share/man/man3/curl_easy_pause.3
+#usr/share/man/man3/curl_easy_perform.3
+#usr/share/man/man3/curl_easy_recv.3
+#usr/share/man/man3/curl_easy_reset.3
+#usr/share/man/man3/curl_easy_send.3
+#usr/share/man/man3/curl_easy_setopt.3
+#usr/share/man/man3/curl_easy_strerror.3
+#usr/share/man/man3/curl_easy_unescape.3
+#usr/share/man/man3/curl_escape.3
+#usr/share/man/man3/curl_formadd.3
+#usr/share/man/man3/curl_formfree.3
+#usr/share/man/man3/curl_formget.3
+#usr/share/man/man3/curl_free.3
+#usr/share/man/man3/curl_getdate.3
+#usr/share/man/man3/curl_getenv.3
+#usr/share/man/man3/curl_global_cleanup.3
+#usr/share/man/man3/curl_global_init.3
+#usr/share/man/man3/curl_global_init_mem.3
+#usr/share/man/man3/curl_mprintf.3
+#usr/share/man/man3/curl_multi_add_handle.3
+#usr/share/man/man3/curl_multi_assign.3
+#usr/share/man/man3/curl_multi_cleanup.3
+#usr/share/man/man3/curl_multi_fdset.3
+#usr/share/man/man3/curl_multi_info_read.3
+#usr/share/man/man3/curl_multi_init.3
+#usr/share/man/man3/curl_multi_perform.3
+#usr/share/man/man3/curl_multi_remove_handle.3
+#usr/share/man/man3/curl_multi_setopt.3
+#usr/share/man/man3/curl_multi_socket.3
+#usr/share/man/man3/curl_multi_strerror.3
+#usr/share/man/man3/curl_multi_timeout.3
+#usr/share/man/man3/curl_share_cleanup.3
+#usr/share/man/man3/curl_share_init.3
+#usr/share/man/man3/curl_share_setopt.3
+#usr/share/man/man3/curl_share_strerror.3
+#usr/share/man/man3/curl_slist_append.3
+#usr/share/man/man3/curl_slist_free_all.3
+#usr/share/man/man3/curl_strequal.3
+#usr/share/man/man3/curl_unescape.3
+#usr/share/man/man3/curl_version.3
+#usr/share/man/man3/curl_version_info.3
+#usr/share/man/man3/libcurl-easy.3
+#usr/share/man/man3/libcurl-errors.3
+#usr/share/man/man3/libcurl-multi.3
+#usr/share/man/man3/libcurl-share.3
+#usr/share/man/man3/libcurl-tutorial.3
+#usr/share/man/man3/libcurl.3

config/rootfiles/core/28/files

@@ -12,4 +12,7 @@ usr/bin/ssh-keygen
 usr/bin/ssh-keyscan
 usr/lib/openssh/sftp-server
 usr/lib/openssh/ssh-keysign
-usr/sbin/sshd
+usr/sbin/sshd
+usr/lib/libcurl.so
+usr/lib/libcurl.so.4
+usr/lib/libcurl.so.4.1.1

config/rootfiles/packages/vdradmin

@@ -2,6 +2,7 @@ etc/rc.d/init.d/vdradmin
 etc/rc.d/rc0.d/K01vdradmin
 etc/rc.d/rc6.d/K01vdradmin
 etc/rc.d/rc3.d/S99vdradmin
+#etc/vdradmin
 etc/vdradmin/vdradmind.conf
 usr/bin/vdradmind
 #usr/share/doc/vdradmin

lfs/curl

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 7.15.3
+VER        = 7.19.4
 
 THISAPP    = curl-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d71b2ee8febfde2c7dc30a43638ec0d9
+$(DL_FILE)_MD5 = 2734167c1e5f7ce6be99b75d2d371d85
 
 install : $(TARGET)