From 40bf460fab938d4101c9958a3d0396dc6c988474 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 14 Dec 2006 15:36:12 +0000 Subject: [PATCH] - remove usage of SUSv3 legacy functions. --- .../openswan-2.4.7-010-susv3-legacy.patch | 22 +++++++++++++++++++ package/openswan/openswan.mk | 5 +---- 2 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 package/openswan/openswan-2.4.7-010-susv3-legacy.patch diff --git a/package/openswan/openswan-2.4.7-010-susv3-legacy.patch b/package/openswan/openswan-2.4.7-010-susv3-legacy.patch new file mode 100644 index 0000000000..e2194dbfa1 --- /dev/null +++ b/package/openswan/openswan-2.4.7-010-susv3-legacy.patch @@ -0,0 +1,22 @@ +--- openswan-2.4.7.oorig/lib/libopenswan/alg_info.c 2006-10-06 18:47:38.000000000 +0200 ++++ openswan-2.4.7/lib/libopenswan/alg_info.c 2006-12-14 14:27:29.000000000 +0100 +@@ -649,7 +649,7 @@ alg_info_esp_create_from_str (const char + + if (!alg_info_esp) goto out; + +- pfs_name=index (alg_str, ';'); ++ pfs_name=strchr (alg_str, ';'); + + if (pfs_name) { + memcpy(esp_buf, alg_str, pfs_name-alg_str); +--- openswan-2.4.7.oorig/programs/ikeping/ikeping.c 2005-07-08 04:56:38.000000000 +0200 ++++ openswan-2.4.7/programs/ikeping/ikeping.c 2006-12-14 14:31:36.000000000 +0100 +@@ -315,7 +315,7 @@ main(int argc, char **argv) + natt=0; + listen_only=0; + noDNS=0; +- bzero(&laddr, sizeof(laddr)); ++ memset(&laddr, 0, sizeof(laddr)); + + while((c = getopt_long(argc, argv, "hVnvsp:b:46E:w:", long_opts, 0))!=EOF) { + switch (c) { diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk index b6a3e27005..306fc09b33 100644 --- a/package/openswan/openswan.mk +++ b/package/openswan/openswan.mk @@ -24,10 +24,7 @@ $(OPENSWAN_DIR)/.unpacked: $(DL_DIR)/$(OPENSWAN_SOURCE) toolchain/patch-kernel.sh $(OPENSWAN_DIR) package/openswan/ openswan\*.patch touch $(OPENSWAN_DIR)/.unpacked -$(OPENSWAN_DIR)/.configured: $(OPENSWAN_DIR)/.unpacked - touch $(OPENSWAN_DIR)/.configured - -$(OPENSWAN_DIR)/$(OPENSWAN_BINARY): $(OPENSWAN_DIR)/.configured +$(OPENSWAN_DIR)/$(OPENSWAN_BINARY): $(OPENSWAN_DIR)/.unpacked @echo $(LINUX_KERNEL) $(TARGET_CONFIGURE_OPTS) \ $(MAKE) -C $(OPENSWAN_DIR) \ -- 2.30.2