upg gettext libksba
This commit is contained in:
parent
30c9012fcb
commit
ba4bb4ad78
|
|
@ -6,8 +6,8 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=gettext
|
||||
pkgver=0.21.1
|
||||
pkgrel=05
|
||||
pkgver=0.22
|
||||
pkgrel=01
|
||||
pkgdesc="GNU internationalization library"
|
||||
url="https://www.gnu.org/software/gettext/"
|
||||
#depends=(gcc-libs acl sh glib2 libunistring libcroco)
|
||||
|
|
@ -15,7 +15,7 @@ makedepends=(gettext emacs-git git)
|
|||
optdepends=('git: for autopoint infrastructure updates')
|
||||
#options=(!docs)
|
||||
source=(https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig}
|
||||
gettext-0.21-disable-libtextstyle.patch)
|
||||
gettext-0.22-disable-libtextstyle.patch)
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
|
|
@ -23,7 +23,7 @@ prepare() {
|
|||
# Do not build libtextstyle, as it depends on libcroco
|
||||
# which is now unmaintained and has known security bugs.
|
||||
# patch from Fedora
|
||||
patch -p1 -i $srcdir/gettext-0.21-disable-libtextstyle.patch
|
||||
patch -p1 -i $srcdir/gettext-0.22-disable-libtextstyle.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -65,8 +65,9 @@ validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno
|
|||
'68D94D8AAEEAD48AE7DC5B904F494A942E4616C2'
|
||||
'9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development)
|
||||
|
||||
sha256sums=(e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45 # gettext-0.21.1.tar.gz
|
||||
f51d7e1764fc3355d842da5e91e2dfb842dfcf7f81382a901dafb0009593d7d2 # gettext-0.21.1.tar.gz.sig
|
||||
544ce0589e9c70f4f75d77c76fd36f88d009ac9cfecb4812a67f878e38ac6418) # gettext-0.21-disable-libtextstyle.patch
|
||||
sha256sums=(49f089be11b490170bbf09ed2f51e5f5177f55be4cc66504a5861820e0fb06ab # gettext-0.22.tar.gz
|
||||
74b028d3c39eab0612cbd70649acc082f4879bb7912b6befeb880fae1f41db31 # gettext-0.22.tar.gz.sig
|
||||
d751adc12a1f1d0b7556b1045f0f427b11345242f2a245542d8baade74177f97) # gettext-0.22-disable-libtextstyle.patch
|
||||
|
||||
## eb3aa83a2402d4fda7e4f09112b1f25b33e3195666e585ef70f1a902d9ee23dd gettext-0.22-01-x86_64.pkg.tar.lz
|
||||
|
||||
## 571b69203c6b2359ab3fe1739f5a24f1518b6aee13a3c8325de8230c74be8a87 gettext-0.21.1-05-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Maintainer:
|
||||
|
||||
pkgname=gettext
|
||||
pkgver=0.21.1
|
||||
pkgrel=5
|
||||
pkgver=0.22
|
||||
pkgrel=1
|
||||
pkgdesc="GNU internationalization library"
|
||||
url="https://www.gnu.org/software/gettext/"
|
||||
arch=(x86_64)
|
||||
|
|
@ -12,10 +12,10 @@ makedepends=(gettext emacs git)
|
|||
optdepends=('git: for autopoint infrastructure updates')
|
||||
options=(!docs)
|
||||
source=(https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig}
|
||||
gettext-0.21-disable-libtextstyle.patch)
|
||||
sha256sums=('e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45'
|
||||
gettext-0.22-disable-libtextstyle.patch)
|
||||
sha256sums=('49f089be11b490170bbf09ed2f51e5f5177f55be4cc66504a5861820e0fb06ab'
|
||||
'SKIP'
|
||||
'544ce0589e9c70f4f75d77c76fd36f88d009ac9cfecb4812a67f878e38ac6418')
|
||||
'd751adc12a1f1d0b7556b1045f0f427b11345242f2a245542d8baade74177f97')
|
||||
validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno
|
||||
'68D94D8AAEEAD48AE7DC5B904F494A942E4616C2'
|
||||
'9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development)
|
||||
|
|
@ -27,7 +27,7 @@ prepare() {
|
|||
# Do not build libtextstyle, as it depends on libcroco
|
||||
# which is now unmaintained and has known security bugs.
|
||||
# patch from Fedora
|
||||
patch -p1 -i $srcdir/gettext-0.21-disable-libtextstyle.patch
|
||||
patch -p1 -i $srcdir/gettext-0.22-disable-libtextstyle.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -4,3 +4,4 @@ git
|
|||
autoconf
|
||||
automake
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,128 @@
|
|||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 815e3c7..e897de7 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -19,7 +19,7 @@
|
||||
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
-SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools
|
||||
+SUBDIRS = gnulib-local gettext-runtime gettext-tools
|
||||
|
||||
changelog_etc = \
|
||||
gettext-runtime/ChangeLog.0 \
|
||||
@@ -123,7 +123,6 @@ distcheck-hook:
|
||||
test "`sed 1,16d $(srcdir)/gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/xsize.h | md5sum`"
|
||||
cmp -s $(srcdir)/gettext-runtime/man/help2man $(srcdir)/gettext-tools/man/help2man
|
||||
cmp -s $(srcdir)/gettext-runtime/man/x-to-1.in $(srcdir)/gettext-tools/man/x-to-1.in
|
||||
- cmp -s $(srcdir)/libtextstyle/m4/libtextstyle.m4 $(srcdir)/gettext-tools/gnulib-m4/libtextstyle.m4
|
||||
cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.java $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.java
|
||||
cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.class $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.class
|
||||
test "`sed 1,15d $(srcdir)/gnulib-local/lib/alloca.in.h | md5sum`" = "`sed 1,15d $(srcdir)/gettext-runtime/libasprintf/alloca.in.h | md5sum`"
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 49689fb..2d23b44 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -37,7 +37,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
|
||||
dnl Checks for library functions.
|
||||
|
||||
-AC_CONFIG_SUBDIRS([gettext-runtime libtextstyle gettext-tools])
|
||||
+AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools])
|
||||
|
||||
AM_EXTRA_RECURSIVE_TARGETS([maintainer-update-po])
|
||||
|
||||
@@ -49,7 +49,7 @@ AC_CANONICAL_HOST
|
||||
dnl Optional Features: AC_ARG_ENABLE calls
|
||||
dnl Optional Packages: AC_ARG_WITH calls
|
||||
dnl Some influential environment variables: AC_ARG_VAR calls
|
||||
-esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd libtextstyle && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.libtextstyle | grep -v installed.csharp | grep -v 'installed C#'; } | sed -f build-aux/ac-help.sed ])
|
||||
+esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.csharp | grep -v 'installed C#'; } | sed -f build-aux/ac-help.sed ])
|
||||
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
|
||||
diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
|
||||
index 449a797..c5719c2 100644
|
||||
--- a/gettext-tools/Makefile.am
|
||||
+++ b/gettext-tools/Makefile.am
|
||||
@@ -19,7 +19,7 @@
|
||||
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
|
||||
ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
|
||||
|
||||
-SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
|
||||
+SUBDIRS = gnulib-lib libgrep libgettextpo src po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
|
||||
|
||||
EXTRA_DIST = misc/DISCLAIM
|
||||
MOSTLYCLEANFILES = core *.stackdump
|
||||
diff --git a/gettext-tools/libgettextpo/textstyle.in.h b/gettext-tools/libgettextpo/textstyle.in.h
|
||||
index 536b51b..585ce66 100644
|
||||
--- a/gettext-tools/libgettextpo/textstyle.in.h
|
||||
+++ b/gettext-tools/libgettextpo/textstyle.in.h
|
||||
@@ -213,7 +213,8 @@ typedef ostream_t file_ostream_t;
|
||||
static inline file_ostream_t
|
||||
file_ostream_create (FILE *fp)
|
||||
{
|
||||
- return fp;
|
||||
+ /* Closing the stream we return should not close 'fp'. */
|
||||
+ return fdopen (dup (fileno (fp)), "w");
|
||||
}
|
||||
|
||||
/* --------------------------- From fd-ostream.h --------------------------- */
|
||||
@@ -413,6 +414,30 @@ html_styled_ostream_create (ostream_t destination _GL_UNUSED,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+/* ----------------------- From noop-styled-ostream.h ----------------------- */
|
||||
+
|
||||
+/* noop_styled_ostream_t is a subtype of ostream_t. */
|
||||
+typedef ostream_t noop_styled_ostream_t;
|
||||
+
|
||||
+#define noop_styled_ostream_write_mem ostream_write_mem
|
||||
+#define noop_styled_ostream_flush ostream_flush
|
||||
+#define noop_styled_ostream_free ostream_free
|
||||
+#define noop_styled_ostream_begin_use_class styled_ostream_begin_use_class
|
||||
+#define noop_styled_ostream_end_use_class styled_ostream_end_use_class
|
||||
+#define noop_styled_ostream_get_hyperlink_ref styled_ostream_get_hyperlink_ref
|
||||
+#define noop_styled_ostream_get_hyperlink_id styled_ostream_get_hyperlink_id
|
||||
+#define noop_styled_ostream_set_hyperlink styled_ostream_set_hyperlink
|
||||
+#define noop_styled_ostream_flush_to_current_style styled_ostream_flush_to_current_style
|
||||
+
|
||||
+static inline ostream_t
|
||||
+noop_styled_ostream_create (ostream_t destination, bool pass_ownership)
|
||||
+{
|
||||
+ if (pass_ownership)
|
||||
+ return destination;
|
||||
+ else
|
||||
+ return fdopen (dup (fileno (destination)), "w");
|
||||
+}
|
||||
+
|
||||
/* ------------------------------ From color.h ------------------------------ */
|
||||
|
||||
#define color_test_mode false
|
||||
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
|
||||
index 764ffad..eccfbbd 100644
|
||||
--- a/gettext-tools/src/Makefile.am
|
||||
+++ b/gettext-tools/src/Makefile.am
|
||||
@@ -292,19 +292,9 @@ cldr_plurals_SOURCES = cldr-plural.y cldr-plural-exp.c cldr-plurals.c
|
||||
cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML)
|
||||
cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
|
||||
|
||||
-if USE_INSTALLED_LIBTEXTSTYLE
|
||||
-LT_LIBTEXTSTYLE = @LTLIBTEXTSTYLE@
|
||||
-else
|
||||
-# How to get the include files of libtextstyle.
|
||||
-textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
|
||||
- here=`pwd`; \
|
||||
- cd ../../libtextstyle/lib && \
|
||||
- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
|
||||
-BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
|
||||
-MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
|
||||
-# Where to find the built libtextstyle library.
|
||||
-LT_LIBTEXTSTYLE = ../../libtextstyle/lib/libtextstyle.la
|
||||
-endif
|
||||
+# Use the dummy libtextstyle from gnulib, as libgettextpo does.
|
||||
+LT_LIBTEXTSTYLE =
|
||||
+AM_CPPFLAGS += -I../libgettextpo -I$(top_srcdir)/libgettextpo
|
||||
|
||||
# How to build libgettextsrc.la.
|
||||
# Need ../gnulib-lib/libgettextlib.la.
|
||||
|
|
@ -6,11 +6,10 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=libksba
|
||||
pkgver=1.6.3
|
||||
pkgver=1.6.4
|
||||
pkgrel=01
|
||||
pkgdesc='Library for working with X.509 certificates, CMS data and related objects'
|
||||
url='https://www.gnupg.org/related_software/libksba/'
|
||||
arch=('x86_64')
|
||||
depends=('bash' 'libgpg-error' 'glibc')
|
||||
source=("https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
|
||||
|
||||
|
|
@ -30,14 +29,17 @@ package() {
|
|||
make DESTDIR="${pkgdir}" install
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL')
|
||||
|
||||
validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch
|
||||
'6DAA6E64A76D2840571B4902528897B826403ADA') # Werner Koch (dist signing 2020)
|
||||
|
||||
sha256sums=(3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c # libksba-1.6.3.tar.bz2
|
||||
5efbf3c44db34a0386450d9fe8dea359900985de18018c410d88a5b485e195f2) # libksba-1.6.3.tar.bz2.sig
|
||||
sha256sums=(bbb43f032b9164d86c781ffe42213a83bf4f2fee91455edfa4654521b8b03b6b # libksba-1.6.4.tar.bz2
|
||||
0ab213c5a37ead1f951e1d6f2aebad3d53fbf27230982364b1e7a33981eb1aeb) # libksba-1.6.4.tar.bz2.sig
|
||||
|
||||
## e12d582f24411c43b78bc3c402e93a7211ddd92bcae5bd216b0638ec04263d69 libksba-1.6.4-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
|
||||
|
||||
pkgname=libksba
|
||||
pkgver=1.6.3
|
||||
pkgver=1.6.4
|
||||
pkgrel=1
|
||||
pkgdesc='Library for working with X.509 certificates, CMS data and related objects'
|
||||
url='https://www.gnupg.org/related_software/libksba/'
|
||||
|
|
@ -10,7 +10,7 @@ license=('GPL')
|
|||
arch=('x86_64')
|
||||
depends=('bash' 'libgpg-error' 'glibc')
|
||||
source=("https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
|
||||
sha256sums=('3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c'
|
||||
sha256sums=('bbb43f032b9164d86c781ffe42213a83bf4f2fee91455edfa4654521b8b03b6b'
|
||||
'SKIP')
|
||||
validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch
|
||||
'6DAA6E64A76D2840571B4902528897B826403ADA') # Werner Koch (dist signing 2020)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,2 @@
|
|||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue