From 7a4e9f4908a89cb0233f25f8e0f36da8887bf15480f7f628fbe253cf8bea2ca1 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 6 Feb 2013 10:01:24 +0000
Subject: [PATCH] Accepting request 151292 from
 home:elvigia:branches:Base:System

**For 12.3 too **

- Current glibc in 12.3/factory no longer exports internal
  function __secure_getenv() but has secure_getenv() instead.

OBS-URL: https://build.opensuse.org/request/show/151292
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=152
---
 0001-Test-for-secure_getenv-too.patch | 41 +++++++++++++++++++++++++++
 util-linux.changes                    |  6 ++++
 util-linux.spec                       |  4 ++-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 0001-Test-for-secure_getenv-too.patch

diff --git a/0001-Test-for-secure_getenv-too.patch b/0001-Test-for-secure_getenv-too.patch
new file mode 100644
index 0000000..24313af
--- /dev/null
+++ b/0001-Test-for-secure_getenv-too.patch
@@ -0,0 +1,41 @@
+From a6f605ed6dcfdf2ea7f6b0bf68e18d8c9ce5ea96 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
+Date: Tue, 5 Feb 2013 02:06:04 -0300
+Subject: [PATCH] Test for secure_getenv too.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In current glibc versions, internal __secure_getenv
+no longer exists and was replaced by secure_getenv()
+
+Signed-off-by: Cristian Rodríguez <crrodriguez@opensuse.org>
+---
+ configure.ac | 1 +
+ lib/env.c    | 5 +++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+--- util-linux-2.21.2.orig/configure.ac
++++ util-linux-2.21.2/configure.ac
+@@ -281,6 +281,7 @@ AC_CHECK_FUNCS(
+ 	posix_fadvise \
+ 	getmntinfo \
+ 	__secure_getenv \
++  secure_getenv \
+ 	warn \
+ 	warnx \
+ 	rpmatch])
+--- util-linux-2.21.2.orig/lib/env.c
++++ util-linux-2.21.2/lib/env.c
+@@ -98,8 +98,9 @@ char *safe_getenv(const char *arg)
+ 		return NULL;
+ #endif
+ #endif
+-
+-#ifdef HAVE___SECURE_GETENV
++#ifdef HAVE_SECURE_GETENV
++return secure_getenv(arg);
++#elif HAVE___SECURE_GETENV
+ 	return __secure_getenv(arg);
+ #else
+ 	return getenv(arg);
diff --git a/util-linux.changes b/util-linux.changes
index ea7d050..8081c6a 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb  5 14:32:49 UTC 2013 - crrodriguez@opensuse.org
+
+- Current glibc in 12.3/factory no longer exports internal 
+  function __secure_getenv() but has secure_getenv() instead.
+
 -------------------------------------------------------------------
 Mon Jan  7 13:26:15 UTC 2013 - puzel@suse.com
 
diff --git a/util-linux.spec b/util-linux.spec
index 45fdddc..ad08dde 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -114,7 +114,8 @@ Patch22:        add-canonicalize_path_restricted.patch
 Patch23:        mount-sanitize-paths-from-non-root-users.patch
 Patch24:        umount-sanitize-paths-from-non-root-users.patch
 #####
-
+# There is no __secure_getenv anymore..
+Patch25:        0001-Test-for-secure_getenv-too.patch
 ##
 ## adjtimex
 ##
@@ -232,6 +233,7 @@ Files to develop applications using the libmount library.
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
 #
 cd adjtimex-*
 # adjtimex patches belongs here