scm-commits July 2015

scm-commits@lists.fedoraproject.org

10 participants
33284 discussions

smani pushed to devscripts (master). "Fix licensecheck incorrectly detecting mime strings such as text/x-c++ as a binary file (#1249227)"
by notifications＠fedoraproject.org 01 Aug '15

01 Aug '15

From 81b2b4bba40c521e1812613d1bc20829b136f560 Mon Sep 17 00:00:00 2001 From: Sandro Mani <manisandro(a)gmail.com> Date: Sat, 1 Aug 2015 00:05:29 +0200 Subject: Fix licensecheck incorrectly detecting mime strings such as text/x-c++ as a binary file (#1249227) diff --git a/devscripts.spec b/devscripts.spec index 95a272a..9a9aba4 100644 --- a/devscripts.spec +++ b/devscripts.spec @@ -1,6 +1,6 @@ Name: devscripts Version: 2.15.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Scripts for Debian Package maintainers License: GPLv2+ @@ -12,6 +12,8 @@ Patch0: devscripts_docbook.patch Patch1: devscripts_install-layout.patch # Install some additional man pages Patch2: devscripts_install-man.patch +# Fix licensecheck incorrectly detecting mime strings such as text/x-c++ as a binary file +Patch3: devscripts_licensecheck.patch # rpmdevtools < 8.4 bundled some of the scripts provided by this package Conflicts: rpmdevtools < 8.4 @@ -108,6 +110,7 @@ This package contains the following subset of the devscripts scripts: %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" @@ -159,6 +162,9 @@ ln -s %{_mandir}/man1/pts-subscribe.1.gz %{buildroot}%{_mandir}/man1/pts-unsubsc %changelog +* Sat Aug 01 2015 Sandro Mani <manisandro(a)gmail.com> - 2.15.6-2 +- Fix licensecheck incorrectly detecting mime strings such as text/x-c++ as a binary file (#1249227) + * Wed Jul 29 2015 Sandro Mani <manisandro(a)gmail.com> - 2.15.6-1 - Update to 2.15.6 diff --git a/devscripts_licensecheck.patch b/devscripts_licensecheck.patch index 0a7fbf7..0beabab 100644 --- a/devscripts_licensecheck.patch +++ b/devscripts_licensecheck.patch @@ -1,23 +1,12 @@ -diff -rupN devscripts-2.15.5/scripts/licensecheck.pl devscripts-2.15.5-new/scripts/licensecheck.pl ---- devscripts-2.15.5/scripts/licensecheck.pl 2015-06-11 05:14:09.000000000 +0200 -+++ devscripts-2.15.5-new/scripts/licensecheck.pl 2015-07-09 19:49:18.917819318 +0200 -@@ -321,13 +321,15 @@ while (@files) { - my %copyrights; - +diff -rupN devscripts-2.15.6/scripts/licensecheck.pl devscripts-2.15.6-new/scripts/licensecheck.pl +--- devscripts-2.15.6/scripts/licensecheck.pl 2015-07-28 05:15:12.000000000 +0200 ++++ devscripts-2.15.6-new/scripts/licensecheck.pl 2015-08-01 00:02:21.376875372 +0200 +@@ -323,7 +323,7 @@ while (@files) { # Encode::Guess does not work well, use good old file command to get file encoding -- my $mime = `file -bi $file`; -+ my $mime = `file --brief --mime --dereference $file`; + my $mime = `file --brief --mime --dereference $file`; my $charset ; -- if ($mime =~ /charset=([\w-]+)/) { -- $charset = $1; -+ if ($mime =~ m!text/\w+; charset=([\w-]+)!) { -+ $charset = $1; +- if ($mime =~ m!(?:text/[\w-]+|application/xml); charset=([\w-]+)!) { ++ if ($mime =~ m!(?:text/[\w-\+]+|application/xml); charset=([\w-]+)!) { + $charset = $1; } else { -- die "can't find charset of $file\n"; -+ chomp $mime; -+ warn "$0 warning: cannot parse file '$file' with mime type '$mime'\n"; -+ next; - } - - open (my $F, '<' ,$file) or die "Unable to access $file\n"; -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/devscripts.git/commit/?h=master&id=81b2b…

1 0

amigadave uploaded tracker-1.4.1.tar.xz for tracker
by notifications＠fedoraproject.org 01 Aug '15

01 Aug '15

0b3bf0196f679b6a1e9e2af9025da8cd tracker-1.4.1.tar.xz http://pkgs.fedoraproject.org/lookaside/pkgs/tracker/tracker-1.4.1.tar.xz/m…

1 0

mstevens pushed to pdns (f23). "Switch to pkgdocdir"
by notifications＠fedoraproject.org 01 Aug '15

01 Aug '15

From 52a6e9b66b2425ec824bc431d5b4ab167840c4c9 Mon Sep 17 00:00:00 2001 From: Morten Stevens <mstevens(a)imt-systems.com> Date: Fri, 31 Jul 2015 23:49:53 +0200 Subject: Switch to pkgdocdir diff --git a/pdns.spec b/pdns.spec index 8f855ac..fe9ed3d 100644 --- a/pdns.spec +++ b/pdns.spec @@ -3,7 +3,7 @@ Name: pdns Version: 3.4.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A modern, advanced and high performance authoritative-only nameserver Group: System Environment/Daemons License: GPLv2 @@ -276,15 +276,15 @@ exit 0 %{_mandir}/man1/dnsdist.1.gz %files backend-mysql -%doc modules/gmysqlbackend/schema.mysql.sql -%doc modules/gmysqlbackend/dnssec-3.x_to_3.4.0_schema.mysql.sql -%doc modules/gmysqlbackend/nodnssec-3.x_to_3.4.0_schema.mysql.sql +%{_pkgdocdir}/schema.mysql.sql +%{_pkgdocdir}/dnssec-3.x_to_3.4.0_schema.mysql.sql +%{_pkgdocdir}/nodnssec-3.x_to_3.4.0_schema.mysql.sql %{_libdir}/%{name}/libgmysqlbackend.so %files backend-postgresql -%doc modules/gpgsqlbackend/schema.pgsql.sql -%doc modules/gpgsqlbackend/dnssec-3.x_to_3.4.0_schema.pgsql.sql -%doc modules/gpgsqlbackend/nodnssec-3.x_to_3.4.0_schema.pgsql.sql +%{_pkgdocdir}/schema.pgsql.sql +%{_pkgdocdir}/dnssec-3.x_to_3.4.0_schema.pgsql.sql +%{_pkgdocdir}/nodnssec-3.x_to_3.4.0_schema.pgsql.sql %{_libdir}/%{name}/libgpgsqlbackend.so %files backend-pipe @@ -304,9 +304,9 @@ exit 0 %{_libdir}/%{name}/libluabackend.so %files backend-sqlite -%doc modules/gsqlite3backend/schema.sqlite3.sql -%doc modules/gsqlite3backend/dnssec-3.x_to_3.4.0_schema.sqlite3.sql -%doc modules/gsqlite3backend/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql +%{_pkgdocdir}/schema.sqlite3.sql +%{_pkgdocdir}/dnssec-3.x_to_3.4.0_schema.sqlite3.sql +%{_pkgdocdir}/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql %{_libdir}/%{name}/libgsqlite3backend.so %files backend-opendbx @@ -316,6 +316,7 @@ exit 0 %{_libdir}/%{name}/libgeoipbackend.so %files backend-mydns +%{_pkgdocdir}/schema.mydns.sql %{_libdir}/%{name}/libmydnsbackend.so %files backend-tinydns @@ -325,6 +326,9 @@ exit 0 %{_libdir}/%{name}/liblmdbbackend.so %changelog +* Fri Jul 31 2015 Morten Stevens <mstevens(a)imt-systems.com> - 3.4.5-7 +- Switch to pkgdocdir + * Fri Jul 31 2015 Morten Stevens <mstevens(a)imt-systems.com> - 3.4.5-6 - Mbedtls build dep temporary disabled due build issues -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/pdns.git/commit/?h=f23&id=52a6e9b66b2425…

1 0

mstevens pushed to pdns (master). "Switch to pkgdocdir"
by notifications＠fedoraproject.org 01 Aug '15

01 Aug '15

1 0

Fedora Notifications Digest (6 updates)
by notifications＠fedoraproject.org 01 Aug '15

01 Aug '15

Fri Jul 31 21:35:45 2015, nobrakal set the monitor flag of tinyxpath to False nobrakal set the monitor flag of tinyxpath to False Fri Jul 31 21:35:49 2015, nobrakal set the monitor flag of tinyxpath to True nobrakal set the monitor flag of tinyxpath to True Fri Jul 31 21:35:53 2015, nobrakal set the monitor flag of tinyxpath to nobuild nobrakal set the monitor flag of tinyxpath to nobuild Fri Jul 31 21:35:55 2015, nobrakal set the monitor flag of tinyxpath to False nobrakal set the monitor flag of tinyxpath to False Fri Jul 31 21:35:56 2015, nobrakal set the monitor flag of tinyxpath to nobuild nobrakal set the monitor flag of tinyxpath to nobuild Fri Jul 31 21:36:00 2015, nobrakal set the monitor flag of tinyxpath to True nobrakal set the monitor flag of tinyxpath to True

1 0

nobrakal set the monitor flag of tinyxpath to True
by notifications＠fedoraproject.org 01 Aug '15

01 Aug '15

nobrakal set the monitor flag of tinyxpath to True

1 0

nobrakal set the monitor flag of tinyxpath to nobuild
by notifications＠fedoraproject.org 01 Aug '15

01 Aug '15

nobrakal set the monitor flag of tinyxpath to nobuild

1 0

nobrakal set the monitor flag of tinyxpath to nobuild
by notifications＠fedoraproject.org 01 Aug '15

01 Aug '15

nobrakal set the monitor flag of tinyxpath to nobuild

1 0

nobrakal set the monitor flag of tinyxpath to False
by notifications＠fedoraproject.org 01 Aug '15

01 Aug '15

nobrakal set the monitor flag of tinyxpath to False

1 0

nobrakal set the monitor flag of tinyxpath to True
by notifications＠fedoraproject.org 01 Aug '15

01 Aug '15

nobrakal set the monitor flag of tinyxpath to True

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 July 2015