[packages/apk-tools] add lua subpackage
commit eccca299521804cf8a354ee6209965aa03400fd5
Author: Elan Ruusamäe
Date: Sun Nov 4 05:43:43 2018 +0200
add lua subpackage
apk-tools.spec | 27 +++
1 file changed, 27 insertions(+)
---
diff --git a/apk-tools.spec b/apk-tools.spec
index 543d4ae..afac454 100644
--- a/apk-tools.spec
+++ b/apk-tools.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_withlua # build without tests
+
Summary: Alpine Package Keeper - package manager for alpine
Name: apk-tools
Version: 2.10.1
@@ -10,6 +14,7 @@ Patch0: 0001-fix-strncpy-bounds-errors.patch
Patch1:
0002-include-sys-sysmacros.h-for-makedev-definition.patch
Patch2:0001-add-support-for-openssl-1.1.patch
URL: https://git.alpinelinux.org/cgit/apk-tools/
+BuildRequires: lua52-devel
BuildRequires: openssl-devel
BuildRequires: tar >= 1:1.22
BuildRequires: xz
@@ -20,6 +25,13 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
Package manager for Alpine Linux.
+%package lua
+Summary: Lua module for apk-tools
+Group: Base
+
+%description lua
+Lua module for apk-tools.
+
%prep
%setup -q
%patch0 -p1
@@ -27,6 +39,14 @@ Package manager for Alpine Linux.
%patch2 -p1
%build
+generate_config() {
+cat <<-EOF
+ FULL_VERSION=%{version}-%{release}
+ LUAAPK=%{?with_lua:YesPlease}
+ export LUAAPK
+EOF
+}
+generate_config > config.mk
%{__make}
%install
@@ -43,3 +63,10 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_sbindir}/apk
+
+%if %{with lua}
+%files lua
+%defattr(644,root,root,755)
+# XXX: parent dir not packaged
+%{_prefix}/lib/lua/5.2/apk.so
+%endif
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apk-tools.git/commitdiff/eccca299521804cf8a354ee6209965aa03400fd5
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/apk-tools] Created branch master
The branch 'master' was created. Summary of new commits: 9f45253... new, version 2.10.1 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/apk-tools] new, version 2.10.1
commit 9f4525391a27509d7918b2bbf49ff5553c63d14d
Author: Elan Ruusamäe
Date: Sun Nov 4 05:31:29 2018 +0200
new, version 2.10.1
0001-add-support-for-openssl-1.1.patch | 380 +
0001-fix-strncpy-bounds-errors.patch | 67
...de-sys-sysmacros.h-for-makedev-definition.patch | 37 ++
apk-tools.spec | 45 +++
4 files changed, 529 insertions(+)
---
diff --git a/apk-tools.spec b/apk-tools.spec
new file mode 100644
index 000..543d4ae
--- /dev/null
+++ b/apk-tools.spec
@@ -0,0 +1,45 @@
+Summary: Alpine Package Keeper - package manager for alpine
+Name: apk-tools
+Version: 2.10.1
+Release: 1
+License: GPL v2
+Group: Base
+Source0:
https://dev.alpinelinux.org/archive/apk-tools/%{name}-%{version}.tar.xz
+# Source0-md5: d14969082e880bd056644f73ac3b3eb2
+Patch0:0001-fix-strncpy-bounds-errors.patch
+Patch1:
0002-include-sys-sysmacros.h-for-makedev-definition.patch
+Patch2:0001-add-support-for-openssl-1.1.patch
+URL: https://git.alpinelinux.org/cgit/apk-tools/
+BuildRequires: openssl-devel
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define_sbindir /sbin
+
+%description
+Package manager for Alpine Linux.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%build
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+# empty file
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/apk/README
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/apk
diff --git a/0001-add-support-for-openssl-1.1.patch
b/0001-add-support-for-openssl-1.1.patch
new file mode 100644
index 000..18c8c94
--- /dev/null
+++ b/0001-add-support-for-openssl-1.1.patch
@@ -0,0 +1,380 @@
+From beab8545ebb2898a2beb157a4d9424ebddf3e26f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?=
+Date: Fri, 26 Oct 2018 08:21:52 +0300
+Subject: [PATCH] add support for openssl 1.1
+
+---
+ src/apk_blob.h| 2 +-
+ src/apk_io.h | 1 -
+ src/apk_openssl.h | 21 +
+ src/apk_package.h | 2 +-
+ src/archive.c | 17 ++---
+ src/database.c| 19 ---
+ src/io.c | 45 ++---
+ src/package.c | 37 +++--
+ 8 files changed, 90 insertions(+), 54 deletions(-)
+ create mode 100644 src/apk_openssl.h
+
+diff --git a/src/apk_blob.h b/src/apk_blob.h
+index 2d2e30e..4fdd3be 100644
+--- a/src/apk_blob.h
b/src/apk_blob.h
+@@ -14,9 +14,9 @@
+
+ #include
+ #include
+-#include
+
+ #include "apk_defines.h"
++#include "apk_openssl.h"
+
+ typedef const unsigned char *apk_spn_match;
+ typedef unsigned char apk_spn_match_def[256 / 8];
+diff --git a/src/apk_io.h b/src/apk_io.h
+index 94aa989..26c3f28 100644
+--- a/src/apk_io.h
b/src/apk_io.h
+@@ -12,7 +12,6 @@
+ #define APK_IO
+
+ #include
+-#include
+ #include
+ #include
+
+diff --git a/src/apk_openssl.h b/src/apk_openssl.h
+new file mode 100644
+index 000..c45beb9
+--- /dev/null
b/src/apk_openssl.h
+@@ -0,0 +1,21 @@
++#ifndef APK_SSL_COMPAT_H
++#define APK_SSL_COMPAT_H
++
++#include
++#include
++
++#if OPENSSL_VERSION_NUMBER < 0x101fL || (defined(LIBRESSL_VERSION_NUMBER)
&& LIBRESSL_VERSION_NUMBER < 0x207fL)
++
++static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
++{
++ return EVP_MD_CTX_create();
++}
++
++static inline void EVP_MD_CTX_free(EVP_MD_CTX *mdctx)
++{
++ return EVP_MD_CTX_destroy(mdctx);
++}
++
++#endif
++
++#endif
+diff --git a/src/apk_package.h b/src/apk_package.h
+index 87635a9..6c4ff29 100644
+--- a/src/apk_package.h
b/src/apk_package.h
+@@ -58,7 +58,7 @@ struct apk_sign_ctx {
+ int data_verified : 1;
+ char data_checksum[EVP_MAX_MD_SIZE];
+ struct apk_checksum identity;
+- EVP_MD_CTX mdctx;
++ EVP_MD_CTX *mdctx;
+
+ struct {
+ apk_blob_t data;
+diff --git a/src/archive.c b/src/archive.c
+index 9a184fd..f3a66c2 100644
+--- a/src/archive.c
b/src/archive.c
+@@ -28,6 +28,7 @@
+ #include "apk_defines.h"
+ #include "apk_print.h"
+ #include "apk_archive.h"
++#include "apk_openssl.h"
+
+ struct tar_header {
+ /* ustar header, Posix 1003.1 */
+@@ -82,7 +83,7 @@ struct apk_tar_entry_istream {
+ struct apk_istream is;
+ struct apk_istream *tar_is;
+ size_t bytes_left;
+- EVP_MD_CTX mdctx;
++ EVP_MD_CTX *mdctx;
+ struct apk_checksum *csum;
+ time_t mtime;
+ };
+@@ -121,10 +122,10 @@ static ssize_t tar_entry_read(void *stream, void *ptr,
size_t size)
+ if (teis->csum == NULL)
+ return r;
+
+- EVP_DigestUpdate(&teis->mdctx, ptr, r);
++ EVP_DigestUpdate(teis->mdctx, ptr, r);
+ if (teis->bytes_left == 0) {
+- te
DISTFILES: apk-tools: apk-tools-2.10.1.tar.xz
Request by: glen Files fetched: 1 STORED: https://dev.alpinelinux.org/archive/apk-tools/apk-tools-2.10.1.tar.xz d14969082e880bd056644f73ac3b3eb2 apk-tools-2.10.1.tar.xz Size: 130352 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gstreamer0.10] - remove gtk-doc
commit 31be791dc85ead0b7397226dd2088558a60461ca
Author: Lukasz Glebicki
Date: Sun Nov 4 00:40:13 2018 +0100
- remove gtk-doc
gstreamer0.10.spec | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/gstreamer0.10.spec b/gstreamer0.10.spec
index 3d676a8..0cfa086 100644
--- a/gstreamer0.10.spec
+++ b/gstreamer0.10.spec
@@ -2,7 +2,7 @@ Summary:GStreamer Streaming-media framework runtime
Summary(pl.UTF-8): GStreamer - biblioteki środowiska do obróbki strumieni
Name: gstreamer0.10
Version: 0.10.36
-Release: 8
+Release: 8.1
License: LGPL v2+
Group: Libraries
Source0:
http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.xz
@@ -24,7 +24,6 @@ BuildRequires:glib2-devel >= 1:2.24
BuildRequires: glibc-misc
BuildRequires: gnome-doc-tools
BuildRequires: gobject-introspection-devel >= 0.6.8
-BuildRequires: gtk-doc >= 1.6
BuildRequires: libtool >= 1.4
BuildRequires: libxml2-devel >= 1:2.6.26
BuildRequires: nasm
@@ -93,7 +92,6 @@ Statyczne wersje bibliotek GStreamer.
Summary: GStreamer API documentation
Summary(pl.UTF-8): Dokumentacja API Gstreamera
Group: Documentation
-Requires: gtk-doc-common
%if "%{_rpmversion}" >= "5"
BuildArch: noarch
%endif
@@ -125,7 +123,6 @@ Dokumentacja API Gstreamera.
--disable-silent-rules \
--disable-tests \
--enable-docbook \
- --enable-gtk-doc \
--with-html-dir=%{_gtkdocdir}
%{__make}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gstreamer0.10.git/commitdiff/31be791dc85ead0b7397226dd2088558a60461ca
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ruby] load rubygems for Gem class
commit 27553c8baf5777ed22b5b47ef167c9a2688fd671
Author: Elan Ruusamäe
Date: Sat Nov 3 22:59:43 2018 +0200
load rubygems for Gem class
ruby.spec | 6 +++---
rubygems.patch | 11 +++
2 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index 3f9af33..afe22b1 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -10,7 +10,7 @@
%bcond_withbootstrap # build bootstrap version
%bcond_withtests # build without tests
-%definerel 11
+%definerel 12
%defineruby_version2.4
%definepatchlevel 4
%definepkg_version %{ruby_version}.%{patchlevel}
@@ -52,7 +52,7 @@ Source54:
http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt
Source4: rdoc.1
Source5: testrb.1
Source6: operating_system.rb
-#Patch1: %{oname}-ffs.patch
+Patch1:rubygems.patch
Patch2:fix-bison-invocation.patch
Patch3:mkmf-verbose.patch
Patch4:strip-ccache.patch
@@ -644,7 +644,7 @@ wywołującego je. Aby to osiągnąć wystarczy bardzo mało kodu.
%prep
%setup -q -n %{oname}-%{pkg_version} -a2 -a3
-#%patch1 -p1
+%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
diff --git a/rubygems.patch b/rubygems.patch
new file mode 100644
index 000..7d6ab9b
--- /dev/null
+++ b/rubygems.patch
@@ -0,0 +1,11 @@
+--- ruby-2.4.4/lib/rubygems/exceptions.rb~ 2018-11-03 22:58:19.872127348
+0200
ruby-2.4.4/lib/rubygems/exceptions.rb 2018-11-03 21:39:23.0
+0200
+@@ -4,6 +4,8 @@
+ # Each exception needs a brief description and the scenarios where it is
+ # likely to be raised
+
++require 'rubygems'
++
+ ##
+ # Base exception class for RubyGems. All exception raised by RubyGems are a
+ # subclass of this one.
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/27553c8baf5777ed22b5b47ef167c9a2688fd671
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ffmpeg: ffmpeg-4.0.3.tar.xz
Request by: adamg Files fetched: 1 STORED: http://ffmpeg.org/releases/ffmpeg-4.0.3.tar.xz 91b52d8cacbb9693e29c8d2d95c21a9d ffmpeg-4.0.3.tar.xz Size: 8668388 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ffmpeg] - updated to 4.0.3
commit 0f8e424f9e37aad520420f2db3048c5f6fea8baa
Author: Adam Gołębiowski
Date: Sat Nov 3 19:15:21 2018 +0100
- updated to 4.0.3
ffmpeg.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 72358e0..3e6201a 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -77,15 +77,15 @@
Summary: FFmpeg - a very fast video and audio converter
Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo
Name: ffmpeg
-Version: 4.0.2
-Release: 5
+Version: 4.0.3
+Release: 1
# LGPL or GPL, chosen at configure time (GPL version is more featured)
# (postprocessing, some filters, x264, x265, xavs, xvid, xcbgrab)
# using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc)
License: GPL v3+ with LGPL v3+ parts
Group: Applications/Multimedia
Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: ae0bfdf809306a212b4f0e6eb8d1c75e
+# Source0-md5: 91b52d8cacbb9693e29c8d2d95c21a9d
Patch0:%{name}-omx-libnames.patch
URL: http://www.ffmpeg.org/
%{?with_decklink:BuildRequires:Blackmagic_DeckLink_SDK >= 10.6.1}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/0f8e424f9e37aad520420f2db3048c5f6fea8baa
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ethtool: ethtool-4.19.tar.xz
Request by: adamg Files fetched: 1 STORED: https://www.kernel.org/pub/software/network/ethtool/ethtool-4.19.tar.xz c0c3e3339a40cbefed7033b3c7c10df1 ethtool-4.19.tar.xz Size: 221932 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ethtool] - updated to 4.19
commit 7eda39478a9a8b0b1967f5fe19caa728392d
Author: Adam Gołębiowski
Date: Sat Nov 3 19:09:49 2018 +0100
- updated to 4.19
ethtool.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/ethtool.spec b/ethtool.spec
index bbfa2e2..e6f8743 100644
--- a/ethtool.spec
+++ b/ethtool.spec
@@ -3,13 +3,13 @@ Summary(es.UTF-8):Grupos de herramientas Ethernet
Summary(pl.UTF-8): Narzędzie do kontrolowania kart ethernet
Summary(pt_BR.UTF-8): Ferramenta de configuração para placas ethernet PCI
Name: ethtool
-Version: 4.18
+Version: 4.19
Release: 1
Epoch: 1
License: GPL v2
Group: Networking/Admin
Source0:
https://www.kernel.org/pub/software/network/ethtool/%{name}-%{version}.tar.xz
-# Source0-md5: 4904b73b6e5291a4cfe579ba9f26c5a3
+# Source0-md5: c0c3e3339a40cbefed7033b3c7c10df1
URL: https://www.kernel.org/pub/software/network/ethtool/
BuildRequires: autoconf >= 2.52
BuildRequires: automake
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ethtool.git/commitdiff/7eda39478a9a8b0b1967f5fe19caa728392d
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
