ZhuningOS/popt
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Initialize for popt

Browse source
This commit is contained in:
zyppe 2024-02-28 22:12:18 +08:00
commit aa3362b9d7
7 changed files with 472 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
popt-1.16.tar.gz

1
.popt.metadata Normal file
View file

@ -0,0 +1 @@
b17bf3e5ffc1924152b8a17422660e3cf252be0c4ef716c1f77ee45eec244137 popt-1.16.tar.gz

3
baselibs.conf Normal file
View file

@ -0,0 +1,3 @@
libpopt0
obsoletes "popt-<targettype> <= <version>"
arch ppc package popt-devel

74
popt-alignment-checks.patch Normal file
View file

@ -0,0 +1,74 @@
Index: popt-1.16/configure.ac
===================================================================
--- popt-1.16.orig/configure.ac
+++ popt-1.16/configure.ac
@@ -47,7 +47,7 @@ AC_SYS_LARGEFILE
AC_ISC_POSIX
-AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
+AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h stdalign.h)
# For some systems we know that we have ld_version scripts.
# Use it then as default.
Index: popt-1.16/popt.c
===================================================================
--- popt-1.16.orig/popt.c
+++ popt-1.16/popt.c
@@ -25,6 +25,15 @@ extern long long int strtoll(const char
#include "poptint.h"
+#ifdef HAVE_STDALIGN_H
+#include <stdalign.h>
+#define ALIGNOF(x) alignof(x)
+#elif defined __GNUC__
+#define ALIGNOF(x) __alignof__(x)
+#else
+#define ALIGNOF(x) sizeof(x)
+#endif
+
#ifdef MYDEBUG
/*@unchecked@*/
int _popt_debug = 0;
@@ -977,12 +986,8 @@ static unsigned int seed = 0;
int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
{
- if (arg == NULL
-#ifdef NOTYET
/* XXX Check alignment, may fail on funky platforms. */
- || (((unsigned long long)arg) & (sizeof(*arg)-1))
-#endif
- )
+ if (arg == NULL || (((unsigned long)arg) & (ALIGNOF(*arg)-1)))
return POPT_ERROR_NULLARG;
if (aLongLong != 0 && LF_ISSET(RANDOM)) {
@@ -1023,7 +1028,7 @@ int poptSaveLongLong(long long * arg, un
int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
{
/* XXX Check alignment, may fail on funky platforms. */
- if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
+ if (arg == NULL || (((unsigned long)arg) & (ALIGNOF(*arg)-1)))
return POPT_ERROR_NULLARG;
if (aLong != 0 && LF_ISSET(RANDOM)) {
@@ -1056,7 +1061,7 @@ int poptSaveLong(long * arg, unsigned in
int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
{
/* XXX Check alignment, may fail on funky platforms. */
- if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
+ if (arg == NULL || (((unsigned long)arg) & (ALIGNOF(*arg)-1)))
return POPT_ERROR_NULLARG;
if (aLong != 0 && LF_ISSET(RANDOM)) {
@@ -1089,7 +1094,7 @@ int poptSaveInt(/*@null@*/ int * arg, un
int poptSaveShort(/*@null@*/ short * arg, unsigned int argInfo, long aLong)
{
/* XXX Check alignment, may fail on funky platforms. */
- if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
+ if (arg == NULL || (((unsigned long)arg) & (ALIGNOF(*arg)-1)))
return POPT_ERROR_NULLARG;
if (aLong != 0 && LF_ISSET(RANDOM)) {

199
popt-libc-updates.patch Normal file
View file

@ -0,0 +1,199 @@
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -21,7 +21,7 @@ AC_SUBST(LT_AGE, 8)
ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko lv nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
AC_PROG_CC_STDC
-AC_PROG_CC
+AC_USE_SYSTEM_EXTENSIONS
AC_PROG_INSTALL
AC_PROG_LIBTOOL
@@ -40,13 +40,12 @@ else
fi
AC_SUBST(TARGET)
-CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT"
+CFLAGS="$CFLAGS -D_REENTRANT"
AC_GCC_TRADITIONAL
AC_SYS_LARGEFILE
AC_ISC_POSIX
-AM_C_PROTOTYPES
AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
@@ -82,7 +81,7 @@ AC_ARG_ENABLE(build-gcov,
AC_CHECK_FUNC(setreuid, [], [
AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
])
-AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom)
+AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv secure_getenv setregid stpcpy strerror vasprintf srandom)
AM_GNU_GETTEXT([external])
AM_ICONV_LINK
Index: system.h
===================================================================
--- system.h.orig
+++ system.h
@@ -1,10 +1,9 @@
/**
* \file popt/system.h
*/
+#pragma once
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#if defined (__GLIBC__) && defined(__LCLINT__)
/*@-declundef@*/
@@ -42,6 +41,7 @@ extern __const __int32_t *__ctype_touppe
#include <libc.h>
#endif
+#pragma GCC visibility push(hidden)
/*@-incondefs@*/
/*@mayexit@*/ /*@only@*/ /*@out@*/ /*@unused@*/
void * xmalloc (size_t size)
@@ -77,6 +77,8 @@ static inline char * stpcpy (char *dest,
}
#endif
+#pragma GCC visibility pop
+
/* Memory allocation via macro defs to get meaningful locations from mtrace() */
#if defined(HAVE_MCHECK_H) && defined(__GNUC__)
#define vmefail() (fprintf(stderr, "virtual memory exhausted.\n"), exit(EXIT_FAILURE), NULL)
@@ -91,8 +93,12 @@ static inline char * stpcpy (char *dest,
#define xstrdup(_str) strdup(_str)
#endif /* defined(HAVE_MCHECK_H) && defined(__GNUC__) */
-#if defined(HAVE___SECURE_GETENV) && !defined(__LCLINT__)
-#define getenv(_s) __secure_getenv(_s)
+#ifndef HAVE_SECURE_GETENV
+# ifdef HAVE___SECURE_GETENV
+# define secure_getenv __secure_getenv
+# else
+# error neither secure_getenv nor __secure_getenv is available
+# endif
#endif
#if !defined(__GNUC__) && !defined(__attribute__)
Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -14,7 +14,7 @@ EXTRA_DIST = config.rpath lookup3.c auto
SUBDIRS = po . auto
-AM_CPPFLAGS = -I. -I$(top_srcdir)
+AM_CPPFLAGS = -include $(top_srcdir)/system.h -I. -I$(top_srcdir)
noinst_HEADERS = poptint.h system.h
@@ -37,7 +37,7 @@ noinst_SCRIPTS = testit.sh
TESTS_ENVIRONMENT = \
test1="$(top_builddir)/test1"
-TESTS = $(top_srcdir)/testit.sh
+TESTS = testit.sh
include_HEADERS = popt.h
Index: popt.c
===================================================================
--- popt.c.orig
+++ popt.c
@@ -197,7 +197,7 @@ poptContext poptGetContext(const char *
con->execAbsolute = 1;
con->arg_strip = NULL;
- if (getenv("POSIXLY_CORRECT") || getenv("POSIX_ME_HARDER"))
+ if (secure_getenv("POSIXLY_CORRECT") || secure_getenv("POSIX_ME_HARDER"))
con->flags |= POPT_CONTEXT_POSIXMEHARDER;
if (name)
@@ -442,7 +442,7 @@ const char * findProgramPath(/*@null@*/
if (strchr(argv0, '/'))
return xstrdup(argv0);
- if ((path = getenv("PATH")) == NULL || (path = xstrdup(path)) == NULL)
+ if ((path = secure_getenv("PATH")) == NULL || (path = xstrdup(path)) == NULL)
return NULL;
/* The return buffer in t is big enough for any path. */
@@ -1706,6 +1706,7 @@ const char * poptBadOption(poptContext c
const char * poptStrerror(const int error)
{
+ char errbuf[1024];
switch (error) {
case POPT_ERROR_NOARG:
return POPT_("missing argument");
@@ -1728,7 +1729,7 @@ const char * poptStrerror(const int erro
case POPT_ERROR_BADCONFIG:
return POPT_("config file failed sanity test");
case POPT_ERROR_ERRNO:
- return strerror(errno);
+ return strerror_r(errno, errbuf, sizeof errbuf);
default:
return POPT_("unknown error");
}
Index: poptconfig.c
===================================================================
--- poptconfig.c.orig
+++ poptconfig.c
@@ -540,7 +540,7 @@ int poptReadDefaultConfig(poptContext co
if (rc) goto exit;
#endif
- if ((home = getenv("HOME"))) {
+ if ((home = secure_getenv("HOME"))) {
char * fn = malloc(strlen(home) + 20);
if (fn != NULL) {
(void) stpcpy(stpcpy(fn, home), "/.popt");
Index: poptint.h
===================================================================
--- poptint.h.orig
+++ poptint.h
@@ -11,6 +11,8 @@
#include <stdint.h>
+#pragma GCC visibility push(hidden)
+
/**
* Wrapper to free(3), hides const compilation noise, permit NULL, return NULL.
* @param p memory to free
@@ -149,6 +151,8 @@ struct poptContext_s {
pbm_set * arg_strip;
};
+#pragma GCC visibility pop
+
#if defined(POPT_fprintf)
#define POPT_dgettext dgettext
#else
@@ -182,6 +186,8 @@ extern char *nl_langinfo (nl_item __item
#endif
#endif
+#pragma GCC visibility push(hidden)
+
#if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
char *POPT_dgettext(const char * dom, const char * str)
/*@*/;
@@ -200,6 +206,8 @@ const char *POPT_next_char (/*@returned@
#endif
+#pragma GCC visibility pop
+
#if defined(ENABLE_NLS) && defined(HAVE_LIBINTL_H)
#include <libintl.h>
#endif

94
popt.changes Normal file
View file

@ -0,0 +1,94 @@
* Thu Feb 22 2018 fvogt@suse.com
- Use %%license (boo#1082318)
* Tue Aug 8 2017 jengelh@inai.de
- Remove --with-pic which is only for static libs.
- Fix RPM groups.
* Mon Oct 7 2013 schwab@suse.de
- popt-alignment-checks.patch: fix alignment checks
* Sun Jul 7 2013 jengelh@inai.de
- Fix typo in popt-libc-updates.patch that prevented it to work
with glibc before 2.17.
- More robust make install call; remove redundant %%clean section
* Fri Jun 14 2013 coolo@suse.com
- fix popt-libc-updates.patch to work also with automake 1.13
* Mon Apr 15 2013 idonmez@suse.com
- Add Source URL, see https://en.opensuse.org/SourceUrls
* Wed Feb 13 2013 crrodriguez@opensuse.org
- Remove patches:
- config-guess-sub-update.patch
- popt-secure-getenv.patch
run autoreconf instead .
- popt-libc-updates.patch replaces popt-secure-getenv.patch
* test for secure_getenv instead of __secure_getenv
* update configure.ac so it can be regenerated with modern
autotools.
* Internal symbols are already hidden with a linker script,
improve that by hidding symbols with the compiler too.
* use strerror_r instead of strerror in the library.
* Mon Feb 11 2013 crrodriguez@opensuse.org
- popt wants __secure_getenv at configure time, but This
function is no longer available as of glibc 2.17.
test for secure_getenv() instead (popt-secure-getenv.patch)
* Mon Feb 4 2013 dmueller@suse.com
- Add config-guess-sub-update.patch:
* Update config.guess/sub for AArch64
* Fri Jan 25 2013 cfarrell@suse.com
- license update: X11
New spdx.org license list now contains an official entry for X11
* Wed Aug 22 2012 cfarrell@suse.com
- license update: SUSE-XFree86-1.0
This is not the MIT license but rather the old version of the XFree86
license (which is not upstream at spdx.org/Ãlicenses - hence the SUSE
proprietary prefix)
* Sun Feb 12 2012 crrodriguez@opensuse.org
- Libraries back into %%{_libdir}, /usr merge project.
* Sun Oct 9 2011 jengelh@medozas.de
- Add pkgconfig to BuildRequires to get automatic pkgconfig(popt)
provides
* Wed Feb 2 2011 andreas.hanke@gmx-topmail.de
- don't build libpopt.a
- don't list popt.mo files twice
* Sun Jan 16 2011 coolo@novell.com
- use %%find_lang
* Sun Sep 19 2010 dimstar@opensuse.org
- Update to version 1.16:
+ Include xcode prject files in distributed tar ball
+ Build system fixes
+ Provide popt.pc
+ Extended test suite
+ Various fixes
- Changes from version 1.15:
+ Build system fixes
+ avoid displaying --[no]nofoo with POPT_ARGFLAG_TOGGLE.
+ reserve a bit for --[no]opt prefix toggling.
+ trim out escaped newline(s) from file content, other fixes.
+ check/print argv[0] in --help for NULL.
+ misc fixes
- Changes from version 1.14:
+ Build system fixes
+ permit "#define POPT_fprintf fprintf" to lose the malloc'ing
fprintf
+ Many fixes.
+ Updated translations
- Drop popt-1.13-popt_fprintf.diff: Should all be fixed upstream.
In case POPT_fprintf really still does not suffice, we can just
use "#define POPT_fprintf frptinf" and be set. The code is
prepared for this override.
* Mon Jun 28 2010 jengelh@medozas.de
- use %%_smp_mflags
* Wed Apr 7 2010 mls@suse.de
- make libpopt0-32bit obsolete popt-32bit [bnc#544964]
* Mon Feb 1 2010 jengelh@medozas.de
- remove sparcv9-specific baselib exceptions (not needed)
* Sat Dec 12 2009 jengelh@medozas.de
- enable parallel building
- add baselibs.conf as a source
- add baselibs for SPARC
* Fri Aug 28 2009 mrueckert@suse.de
- add back baselibs.conf. bootstrap done
* Fri Aug 28 2009 mrueckert@suse.de
- disable baselibs.conf for the moment
* Wed Aug 26 2009 mls@suse.de
- add baselibs.conf
* Fri Aug 21 2009 mls@suse.de
- initial release

100
popt.spec Normal file
View file

@ -0,0 +1,100 @@
#
# spec file for package popt
#
# Copyright (c) 2022-2023 ZhuningOS
#
Name: popt
Version: 1.16
Release: 3.22
#!BuildIgnore: rpmlint-Factory
Summary: A C library for parsing command line parameters
License: MIT
Group: Development/Libraries/C and C++
Url: http://www.rpm5.org/
#CVS-Clone: -d :pserver:anonymous@rpm5.org:/cvs co popt
Source: http://rpm5.org/files/popt/popt-%{version}.tar.gz
Source2: baselibs.conf
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch0: popt-libc-updates.patch
Patch1: popt-alignment-checks.patch
%description
Popt is a C library for parsing command line parameters. Popt was
heavily influenced by the getopt() and getopt_long() functions. It
improves on them by allowing more powerful argument expansion. Popt can
parse arbitrary argv[] style arrays and automatically set variables
based on command line arguments. Popt allows command line arguments to
be aliased via configuration files and includes utility functions for
parsing arbitrary strings into argv[] arrays using shell-like rules.
%package -n libpopt0
Summary: A C library for parsing command line parameters
Group: System/Libraries
Provides: popt = %{version}
Obsoletes: popt < %{version}
%description -n libpopt0
Popt is a C library for parsing command line parameters. Popt was
heavily influenced by the getopt() and getopt_long() functions. It
improves on them by allowing more powerful argument expansion. Popt can
parse arbitrary argv[] style arrays and automatically set variables
based on command line arguments. Popt allows command line arguments to
be aliased via configuration files and includes utility functions for
parsing arbitrary strings into argv[] arrays using shell-like rules.
%package devel
Summary: Development files for the popt library
Group: Development/Libraries/C and C++
Requires: glibc-devel
Requires: libpopt0 = %{version}
%description devel
The popt-devel package includes header files and libraries necessary
for developing programs which use the popt C library. It contains the
API documentation of the popt library, too.
%prep
%setup -q
%patch0
%patch1 -p1
%build
autoreconf -fiv
%configure --disable-static
make %{?_smp_mflags}
%install
make install DESTDIR="%buildroot"
rm %{buildroot}%{_libdir}/libpopt.la
%if "%{_libdir}" != "%{_prefix}/lib"
install -d -m755 %{buildroot}/%{_libdir}/pkgconfig
mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc
%endif
%find_lang %{name}
%post -n libpopt0 -p /sbin/ldconfig
%postun -n libpopt0 -p /sbin/ldconfig
%files -n libpopt0 -f %{name}.lang
%defattr(-,root,root)
%license COPYING
%doc CHANGES
%{_libdir}/libpopt.so.*
%files devel
%defattr(-,root,root)
%doc README
%{_libdir}/libpopt.so
%{_includedir}/popt.h
%{_mandir}/man3/popt.3*
%{_libdir}/pkgconfig/popt.pc
%changelog