From 37fedfa876d9db4e8de99e75b8aa58a6d5f8ae97 Mon Sep 17 00:00:00 2001
From: Eric Smith <brouhaha@fedoraproject.org>
Date: Sun, 14 Jul 2013 12:34:40 -0600
Subject: [PATCH] Update to latest upstream.

---
 .gitignore                        |  1 +
 libbsd-0.5.2-nosetproctitle.patch | 40 -------------------------------
 libbsd.spec                       | 27 +++++++++++++++++----
 sources                           |  2 +-
 4 files changed, 25 insertions(+), 45 deletions(-)
 delete mode 100644 libbsd-0.5.2-nosetproctitle.patch

diff --git a/.gitignore b/.gitignore
index e1aaa6b..e1d5a82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ libbsd-0.2.0.tar.gz
 /libbsd-0.4.2.tar.gz
 /libbsd-0.5.1.tar.xz
 /libbsd-0.5.2.tar.xz
+/libbsd-0.6.0.tar.xz
diff --git a/libbsd-0.5.2-nosetproctitle.patch b/libbsd-0.5.2-nosetproctitle.patch
deleted file mode 100644
index 46bec22..0000000
--- a/libbsd-0.5.2-nosetproctitle.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -up libbsd-0.5.2/src/setproctitle.c.nosetproctitle libbsd-0.5.2/src/setproctitle.c
---- libbsd-0.5.2/src/setproctitle.c.nosetproctitle	2013-07-07 21:26:04.407952595 -0600
-+++ libbsd-0.5.2/src/setproctitle.c	2013-07-07 21:28:56.859945939 -0600
-@@ -1,3 +1,4 @@
-+#define NO_SETPROCTITLE
- /*
-  * Copyright © 2010 William Ahern
-  * Copyright © 2012-2013 Guillem Jover <guillem@hadrons.org>
-@@ -156,6 +157,7 @@ spt_copyargs(int argc, char *argv[])
- static void
- spt_init(int argc, char *argv[], char *envp[])
- {
-+#ifdef NO_SETPROCTITLE
- 	char *base, *end, *nul, *tmp;
- 	int i, envc, error;
- 
-@@ -213,6 +215,7 @@ spt_init(int argc, char *argv[], char *e
- 	SPT.nul  = nul;
- 	SPT.base = base;
- 	SPT.end  = end;
-+#endif // NO_SETPROCTITLE
- }
- 
- /*
-@@ -230,6 +233,7 @@ void (*spt_init_func)(int argc, char *ar
- void
- setproctitle_impl(const char *fmt, ...)
- {
-+#ifdef NO_SETPROCTITLE
- 	/* Use buffer in case argv[0] is passed. */
- 	char buf[SPT_MAXTITLE + 1];
- 	va_list ap;
-@@ -279,6 +283,7 @@ setproctitle_impl(const char *fmt, ...)
- 		*SPT.nul = ' ';
- 		*++nul = '\0';
- 	}
-+#endif // NO_SETPROCTITLE
- }
- __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5");
- 
diff --git a/libbsd.spec b/libbsd.spec
index f181d29..4499c1d 100644
--- a/libbsd.spec
+++ b/libbsd.spec
@@ -1,6 +1,6 @@
 Name:		libbsd
-Version:	0.5.2
-Release:	3%{?dist}
+Version:	0.6.0
+Release:	1%{?dist}
 Summary:	Library providing BSD-compatible functions for portability
 URL:		http://libbsd.freedesktop.org/
 License:	BSD and ISC and Copyright only and Public Domain
@@ -8,7 +8,6 @@ Group:		System Environment/Libraries
 # BuildRoot tag necessary for EL5 only:
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Source0:	http://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.xz
-Patch0:		libbsd-0.5.2-nosetproctitle.patch     
 
 %description
 libbsd provides useful functions commonly found on BSD systems, and
@@ -25,9 +24,21 @@ Requires:	pkgconfig
 %description devel
 Development files for the libbsd library.
 
+%package ctor-static
+Summary:	Development files for libbsd
+Group:		Development/Libraries
+Requires:	libbsd = %{version}-%{release}
+Requires:	pkgconfig
+
+%description ctor-static
+The libbsd-ctor static library is required if setproctitle() is to be used
+when libbsd is loaded via dlopen() from a threaded program.  This can be
+configured using "pkg-config --libs libbsd-ctor".
+# See the libbsd mailing list message by Guillem Jover on Jul 14 2013:
+#     http://lists.freedesktop.org/archives/libbsd/2013-July/000091.html
+
 %prep
 %setup -q
-%patch0 -p1 -b .nosetproctitle
 
 %configure
 
@@ -68,7 +79,15 @@ rm %{buildroot}%{_libdir}/%{name}.la
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/pkgconfig/%{name}-overlay.pc
 
+%files ctor-static
+%{_libdir}/%{name}-ctor.a
+%{_libdir}/pkgconfig/%{name}-ctor.pc
+
 %changelog
+* Sun Jul 14 2013 Eric Smith <brouhaha@fedoraproject.org> - 0.6.0-1
+- Update to latest upstream release. Remove patch 0.
+- Added ctor-static subpackage.
+
 * Sun Jul 07 2013 Eric Smith <brouhaha@fedoraproject.org> - 0.5.2-3
 - Still having problems with setproctitle(), bug #981799, upstream
   freedesktop.org bug #66679. Added patch to noop out setproctitle().
diff --git a/sources b/sources
index 2fbd665..7ad2272 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be8b2e0dc4614699834c49693574fd1a  libbsd-0.5.2.tar.xz
+f6c75f0a9818e323a589bcbd560a0eb4  libbsd-0.6.0.tar.xz