Update to latest upstream.

epel9
Eric Smith 12 years ago
parent df3c31c11c
commit 37fedfa876

1
.gitignore vendored

@ -4,3 +4,4 @@ libbsd-0.2.0.tar.gz
/libbsd-0.4.2.tar.gz /libbsd-0.4.2.tar.gz
/libbsd-0.5.1.tar.xz /libbsd-0.5.1.tar.xz
/libbsd-0.5.2.tar.xz /libbsd-0.5.2.tar.xz
/libbsd-0.6.0.tar.xz

@ -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");

@ -1,6 +1,6 @@
Name: libbsd Name: libbsd
Version: 0.5.2 Version: 0.6.0
Release: 3%{?dist} Release: 1%{?dist}
Summary: Library providing BSD-compatible functions for portability Summary: Library providing BSD-compatible functions for portability
URL: http://libbsd.freedesktop.org/ URL: http://libbsd.freedesktop.org/
License: BSD and ISC and Copyright only and Public Domain 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 tag necessary for EL5 only:
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Source0: http://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.xz Source0: http://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.xz
Patch0: libbsd-0.5.2-nosetproctitle.patch
%description %description
libbsd provides useful functions commonly found on BSD systems, and libbsd provides useful functions commonly found on BSD systems, and
@ -25,9 +24,21 @@ Requires: pkgconfig
%description devel %description devel
Development files for the libbsd library. 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 %prep
%setup -q %setup -q
%patch0 -p1 -b .nosetproctitle
%configure %configure
@ -68,7 +79,15 @@ rm %{buildroot}%{_libdir}/%{name}.la
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/pkgconfig/%{name}-overlay.pc %{_libdir}/pkgconfig/%{name}-overlay.pc
%files ctor-static
%{_libdir}/%{name}-ctor.a
%{_libdir}/pkgconfig/%{name}-ctor.pc
%changelog %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 * Sun Jul 07 2013 Eric Smith <brouhaha@fedoraproject.org> - 0.5.2-3
- Still having problems with setproctitle(), bug #981799, upstream - Still having problems with setproctitle(), bug #981799, upstream
freedesktop.org bug #66679. Added patch to noop out setproctitle(). freedesktop.org bug #66679. Added patch to noop out setproctitle().

@ -1 +1 @@
be8b2e0dc4614699834c49693574fd1a libbsd-0.5.2.tar.xz f6c75f0a9818e323a589bcbd560a0eb4 libbsd-0.6.0.tar.xz

Loading…
Cancel
Save