scm-commits December 2016

scm-commits@lists.fedoraproject.org

1 participants
15715 discussions

jussilehtola pushed to epson-inkjet-printer-escpr (f24). "Fix FTBFS on rawhide."
by notifications＠fedoraproject.org 01 Dec '16

01 Dec '16

From d90d250a3194ecd0202bc1f5febbd59afe2ab2b3 Mon Sep 17 00:00:00 2001 From: Susi Lehtola <jussilehtola(a)fedoraproject.org> Date: Thu, 1 Dec 2016 02:59:29 +0100 Subject: Fix FTBFS on rawhide. --- epson-inkjet-printer-escpr-inc.patch | 11 +++++++++++ epson-inkjet-printer-escpr.spec | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 epson-inkjet-printer-escpr-inc.patch diff --git a/epson-inkjet-printer-escpr-inc.patch b/epson-inkjet-printer-escpr-inc.patch new file mode 100644 index 0000000..6d60d24 --- /dev/null +++ b/epson-inkjet-printer-escpr-inc.patch @@ -0,0 +1,11 @@ +diff -up epson-inkjet-printer-escpr-1.6.10/src/mem.c.inc epson-inkjet-printer-escpr-1.6.10/src/mem.c +--- epson-inkjet-printer-escpr-1.6.10/src/mem.c.inc 2016-12-01 02:56:24.060587051 +0100 ++++ epson-inkjet-printer-escpr-1.6.10/src/mem.c 2016-12-01 02:56:37.753581610 +0100 +@@ -24,6 +24,7 @@ + + #include <stdlib.h> + #include "mem.h" ++#include "err.h" + + void * + mem_malloc (unsigned int size, bool_t crit) diff --git a/epson-inkjet-printer-escpr.spec b/epson-inkjet-printer-escpr.spec index 11c0d99..6400d98 100644 --- a/epson-inkjet-printer-escpr.spec +++ b/epson-inkjet-printer-escpr.spec @@ -13,9 +13,11 @@ License: GPLv2+ URL: http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX # Download address is garbled on web page Source0: https://download3.ebz.epson.net/dsc/f/03/00/05/20/91/05b7c89713fa6205931750… +# Fix includes +Patch0: epson-inkjet-printer-escpr-inc.patch # Patch from Arch Linux # https://aur.archlinux.org/packages/epson-inkjet-printer-escpr/ -Patch0: epson-inkjet-printer-escpr-filter.patch +Patch1: epson-inkjet-printer-escpr-filter.patch BuildRequires: autoconf BuildRequires: chrpath @@ -49,7 +51,8 @@ http://avasys.jp/english/linux_e/ %prep %setup -q -%patch0 -p1 -b .filter +%patch0 -p1 -b .inc +%patch1 -p1 -b .filter # Fix permissions find . -name \*.h -exec chmod 644 {} \; find . -name \*.c -exec chmod 644 {} \; @@ -91,6 +94,7 @@ rm %{buildroot}%{_libdir}/libescpr.so %changelog * Wed Nov 30 2016 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 1:1.6.10-2.1lsb3.2 +- Fix FTBFS in rawhide. - Add patch that fixes crashes (BZ #1400346). * Thu Nov 24 2016 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 1:1.6.10-1.1lsb3.2 -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/epson-inkjet-printer-escpr.git/commit/?h…

1 0

jussilehtola pushed to epson-inkjet-printer-escpr (f25). "Fix FTBFS on rawhide."
by notifications＠fedoraproject.org 01 Dec '16

01 Dec '16

1 0

jussilehtola pushed to epson-inkjet-printer-escpr (f25). "Fix crashes (BZ #1400346)."
by notifications＠fedoraproject.org 01 Dec '16

01 Dec '16

From 1fdc36ac376948cbe1902cac7a5ae76e1a698eba Mon Sep 17 00:00:00 2001 From: Susi Lehtola <jussilehtola(a)fedoraproject.org> Date: Thu, 1 Dec 2016 02:49:36 +0100 Subject: Fix crashes (BZ #1400346). --- epson-inkjet-printer-escpr-filter.patch | 59 +++++++++++++++++++++++++++++++++ epson-inkjet-printer-escpr.spec | 10 ++++-- 2 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 epson-inkjet-printer-escpr-filter.patch diff --git a/epson-inkjet-printer-escpr-filter.patch b/epson-inkjet-printer-escpr-filter.patch new file mode 100644 index 0000000..5b56e8e --- /dev/null +++ b/epson-inkjet-printer-escpr-filter.patch @@ -0,0 +1,59 @@ +--- epson-inkjet-printer-escpr-1.6.10/src/filter.c 2016-09-21 03:55:30.000000000 +0200 ++++ tmp/filter.c 2016-11-30 18:47:14.050315247 +0100 +@@ -34,6 +34,8 @@ + #include "epson-protocol.h" + #include "epson-escpr-api.h" + #include "epson-escpr-mem.h" ++#include "epson-escpr-services.h" ++#include "epson-escpage.h" + + #include "err.h" + #include "mem.h" +@@ -42,6 +44,11 @@ + #include "libprtX.h" + #include "optBase.h" + #include "linux_cmn.h" ++#include "xfifo.h" ++ ++extern EPS_ERR_CODE SetupJobAttrib (const EPS_JOB_ATTRIB*); ++extern EPS_ERR_CODE SendStartJob (); ++extern EPS_ERR_CODE PrintBand (const EPS_UINT8*, EPS_UINT32, EPS_UINT32*); + + #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4) + +@@ -382,7 +389,7 @@ + } + + printJob.jobStatus = EPS_STATUS_ESTABLISHED; +- int printHeight = 0; ++ EPS_UINT32 printHeight = 0; + /////////////////////////////////////////////////////////////////////////////////////////////////////////// + + print_area_x = printJob.printableAreaWidth; +@@ -535,7 +542,7 @@ + memcpy(rever_buf + k*3, startpage + pos + (bandBmp.widthBytes - 6) - k*3, 3); + } + } +- PrintBand (rever_buf, bandBmp.widthBytes, &printHeight); ++ PrintBand ((const EPS_UINT8 *)rever_buf, bandBmp.widthBytes, &printHeight); + pos -= bandBmp.widthBytes; + } + +@@ -831,7 +838,7 @@ + + /* Get number of pages */ + char page_num; +- read (STDIN_FILENO, &page_num, 1); ++ (void)read (STDIN_FILENO, &page_num, 1); + + /* Others */ + jobAttr.apfAutoCorrect = EPS_APF_ACT_STANDARD; +@@ -881,7 +888,7 @@ + + // fwrite (pBuf, cbBuf, 1, outfp); + +- XFIFOWrite(context, pBuf, cbBuf); ++ XFIFOWrite(context, (char *)pBuf, cbBuf); + + return 1; + } diff --git a/epson-inkjet-printer-escpr.spec b/epson-inkjet-printer-escpr.spec index ad64bc2..11c0d99 100644 --- a/epson-inkjet-printer-escpr.spec +++ b/epson-inkjet-printer-escpr.spec @@ -8,12 +8,14 @@ Summary: Drivers for Epson inkjet printers Group: Applications/System Epoch: 1 Version: 1.6.10 -Release: 1.%{lsb}%{?dist} +Release: 2.%{lsb}%{?dist} License: GPLv2+ URL: http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX # Download address is garbled on web page Source0: https://download3.ebz.epson.net/dsc/f/03/00/05/20/91/05b7c89713fa6205931750… - +# Patch from Arch Linux +# https://aur.archlinux.org/packages/epson-inkjet-printer-escpr/ +Patch0: epson-inkjet-printer-escpr-filter.patch BuildRequires: autoconf BuildRequires: chrpath @@ -47,6 +49,7 @@ http://avasys.jp/english/linux_e/ %prep %setup -q +%patch0 -p1 -b .filter # Fix permissions find . -name \*.h -exec chmod 644 {} \; find . -name \*.c -exec chmod 644 {} \; @@ -87,6 +90,9 @@ rm %{buildroot}%{_libdir}/libescpr.so %{_libdir}/libescpr.so.* %changelog +* Wed Nov 30 2016 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 1:1.6.10-2.1lsb3.2 +- Add patch that fixes crashes (BZ #1400346). + * Thu Nov 24 2016 Susi Lehtola <jussilehtola(a)fedoraproject.org> - 1:1.6.10-1.1lsb3.2 - Update to 1.6.10. -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/epson-inkjet-printer-escpr.git/commit/?h…

1 0

jussilehtola pushed to epson-inkjet-printer-escpr (master). "Fix FTBFS on rawhide."
by notifications＠fedoraproject.org 01 Dec '16

01 Dec '16

1 0

jussilehtola pushed to epson-inkjet-printer-escpr (master). "Fix crashes (BZ #1400346)."
by notifications＠fedoraproject.org 01 Dec '16

01 Dec '16

1 0

mschorm pushed to mariadb (master). "- Log-error option added to all config files examples (..more)"
by notifications＠fedoraproject.org 01 Dec '16

01 Dec '16

From cb9d852433331e2bc7a8c7e458c3d79d0f582b69 Mon Sep 17 00:00:00 2001 From: Michal Schorm <mschorm(a)redhat.com> Date: Thu, 1 Dec 2016 02:00:37 +0100 Subject: - Log-error option added to all config files examples Resolves: #1382988 --- mariadb.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 29e2700..161e5fa 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -879,6 +879,9 @@ mv Docs/README-wsrep Docs/README.wsrep # remove *.jar file from mysql-test rm -rf %{buildroot}%{_datadir}/mysql-test/plugin/connect/connect/std_data/JdbcMariaDB.jar +# +echo -e "\n\nlog-error=/var/log/mariadb/mariadb.log\n" | tee -a %{buildroot}/usr/share/mariadb/*.cnf + %if %{without clibrary} unlink %{buildroot}%{_libdir}/mysql/libmysqlclient.so unlink %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so @@ -1336,12 +1339,13 @@ fi %changelog * Wed Nov 30 2016 Michal Schorm <mschorm(a)redhat.com> - 3:10.1.19-5 - Testsuite blacklists heavily updated. Current tracker: #1399847 +- Log-error option added to all config files examples + Resolves: #1382988 * Wed Nov 16 2016 Michal Schorm <mschorm(a)redhat.com> - 3:10.1.19-4 - JdbcMariaDB.jar test removed - PCRE version check added - Resolves: #1382988 - Related: #1396945, #1096787 + Related: #1382988, #1396945, #1096787 * Wed Nov 16 2016 Michal Schorm <mschorm(a)redhat.com> - 3:10.1.19-4 - test suite ENABLED, consensus was made it still should be run every build -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/mariadb.git/commit/?h=master&id=cb9d8524…

1 0

mschorm pushed to mariadb (f24). "- Log-error option added to all config files examples (..more)"
by notifications＠fedoraproject.org 01 Dec '16

01 Dec '16

1 0

bojan pushed to pypolicyd-spf (f24). "Replace python_sitelib wth python3_sitelib."
by notifications＠fedoraproject.org 01 Dec '16

01 Dec '16

From 8064b1d8f65d827bd1ad5c7530e8392960e494f8 Mon Sep 17 00:00:00 2001 From: Bojan Smojver <bojan(a)rexursive.com> Date: Tue, 29 Nov 2016 11:18:12 +1100 Subject: Replace python_sitelib wth python3_sitelib. --- pypolicyd-spf.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pypolicyd-spf.spec b/pypolicyd-spf.spec index 3c6f0cb..ace6781 100644 --- a/pypolicyd-spf.spec +++ b/pypolicyd-spf.spec @@ -48,7 +48,7 @@ range of requirements. %{_libexecdir}/postfix/policyd-spf %{_mandir}/man1/* %{_mandir}/man5/* -%{python_sitelib}/* +%{python3_sitelib}/* %changelog -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/pypolicyd-spf.git/commit/?h=f24&id=8064b…

1 0

bojan pushed to pypolicyd-spf (f24). "Use py3 macros to build/install. Update release version/changelog."
by notifications＠fedoraproject.org 01 Dec '16

01 Dec '16

From 6172cb2796f310229dde6c966f652e88376bc913 Mon Sep 17 00:00:00 2001 From: Bojan Smojver <bojan(a)rexursive.com> Date: Tue, 29 Nov 2016 11:13:54 +1100 Subject: Use py3 macros to build/install. Update release version/changelog. --- pypolicyd-spf.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pypolicyd-spf.spec b/pypolicyd-spf.spec index e86cddf..3c6f0cb 100644 --- a/pypolicyd-spf.spec +++ b/pypolicyd-spf.spec @@ -1,6 +1,6 @@ Name: pypolicyd-spf Version: 1.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: SPF Policy Server for Postfix (Python implementation) License: ASL 2.0 @@ -28,12 +28,12 @@ range of requirements. %build -%{__python} setup.py build +%py3_build %install %{__rm} -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%py3_install # We want the binary in Postfix libexec directory %{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}/postfix %{__mv} $RPM_BUILD_ROOT%{_bindir}/policyd-spf $RPM_BUILD_ROOT%{_libexecdir}/postfix @@ -52,6 +52,9 @@ range of requirements. %changelog +* Tue Nov 29 2016 Bojan Smojver <bojan(a)rexursive.com> 1.3.2-4 +- try building with and for python3 + * Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.2-3 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Pa… -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/pypolicyd-spf.git/commit/?h=f24&id=6172c…

1 0

bojan pushed to pypolicyd-spf (f24). "- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages"
by notifications＠fedoraproject.org 01 Dec '16

01 Dec '16

From 2e5ccb4e52f65ea0ff160041e1223f0137bddcb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Tue, 19 Jul 2016 08:36:25 +0000 Subject: - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Pa… --- pypolicyd-spf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pypolicyd-spf.spec b/pypolicyd-spf.spec index edc6614..38c3529 100644 --- a/pypolicyd-spf.spec +++ b/pypolicyd-spf.spec @@ -1,6 +1,6 @@ Name: pypolicyd-spf Version: 1.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SPF Policy Server for Postfix (Python implementation) License: ASL 2.0 @@ -52,6 +52,9 @@ range of requirements. %changelog +* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.2-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Pa… + * Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/pypolicyd-spf.git/commit/?h=f24&id=2e5cc…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits December 2016