[Pkg-bitcoin-commits] [cgminer] 03/04: Refreshed patches. Drop format_security.patch, adopted upstream. Updated debian/copyright

Scott Sheridan Howard showard at moszumanska.debian.org
Thu May 22 00:08:38 UTC 2014 

This is an automated email from the git hooks/post-receive script.

showard pushed a commit to branch master
in repository cgminer.

commit c3bd87c673778072a51d0d6bfbf38ceb8c61d0ea
Author: Scott Howard <showard314 at gmail.com>
Date:   Wed May 21 20:07:14 2014 -0400

    Refreshed patches. Drop format_security.patch, adopted upstream. Updated debian/copyright
---
 debian/changelog                     |  2 ++
 debian/copyright                     | 14 +++++++++++-
 debian/copyright_hints               | 35 +++++++++++++++++++++-------
 debian/patches/format-security.patch | 14 ------------
 debian/patches/kfreebsd_usb.patch    |  6 ++---
 debian/patches/series                |  1 -
 debian/patches/system_jansson.patch  | 44 ++++++++++++++++++++++++++++++++----
 debian/rules                         |  3 ++-
 8 files changed, 86 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46cba2b..5c66d71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 cgminer (4.3.3-1) unstable; urgency=low
 
   * New upstream release (Closes: #747880)
+  * Refreshed patches. Drop format_security.patch, adopted upstream
+  * Updated debian/copyright
 
  -- Scott Howard <showard at debian.org>  Wed, 21 May 2014 16:51:03 -0400
 
diff --git a/debian/copyright b/debian/copyright
index 6c95062..6b6455b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -198,9 +198,21 @@ Files: hf_protocol.h
 Copyright: 2013-2014, HashFast Technologies LLC
 License: GPL-3+
 
-Files: driver-SPI-bitmine-A1.c
+Files: A1-board-selector-CCD.c
+       A1-board-selector-CCR.c
+       A1-trimpot-mcp4x.c
+       driver-SPI-bitmine-A1.c
        spi-context.c
 Copyright: 2013-2014, Zefir Kurtisi <zefir.kurtisi at gmail.com>
+           2014, Zefir Kurtisi <zefir.kurtisi at gmail.com>
+License: GPL-3+
+
+Files: driver-spondoolies.c
+       driver-spondoolies.h
+       mg_proto_parser.c
+       mg_proto_parser.h
+Copyright: 2014, Con Kolivas <kernel at kolivas.org>
+           2014, Zvi (Zvisha) Shteingart - Spondoolies-tech.com
 License: GPL-3+
 
 Files: crc.h
diff --git a/debian/copyright_hints b/debian/copyright_hints
index bc4eaf8..b142332 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -5,8 +5,10 @@ Source: FIXME
 Disclaimer: Autogenerated by CDBS
 
 Files: 01-cgminer.rules
- A1-desk-board-selector-tca9535.c
+ A1-board-selector.h
+ A1-common.h
  A1-desk-board-selector.c
+ A1-trimpot-mcp4x.h
  API-README
  ASIC-README
  AUTHORS
@@ -87,7 +89,6 @@ Files: 01-cgminer.rules
  debian/NEWS
  debian/TODO.Debian
  debian/cgminer-api.1
- debian/cgminer.1
  debian/clean
  debian/compat
  debian/control
@@ -207,6 +208,16 @@ Copyright: 2013, Con Kolivas
 License: GPL-3+
  FIXME
 
+Files: A1-board-selector-CCD.c
+ A1-board-selector-CCR.c
+ A1-trimpot-mcp4x.c
+ driver-SPI-bitmine-A1.c
+ spi-context.c
+Copyright: 2013-2014, Zefir Kurtisi <zefir.kurtisi at gmail.com>
+  2014, Zefir Kurtisi <zefir.kurtisi at gmail.com>
+License: GPL-3+
+ FIXME
+
 Files: compat/libusb-1.0/libusb/os/poll_windows.c
  compat/libusb-1.0/libusb/os/poll_windows.h
  compat/libusb-1.0/libusb/os/windows_usb.c
@@ -243,6 +254,14 @@ Copyright: 2013-2014, Andrew Smith - BlackArrow Ltd
 License: GPL-3+
  FIXME
 
+Files: driver-spondoolies.c
+ mg_proto_parser.c
+ mg_proto_parser.h
+Copyright: 2014, Con Kolivas <kernel at kolivas.org>
+  2014, Zvi (Zvisha) Shteingart - Spondoolies-tech.com
+License: GPL-3+
+ FIXME
+
 Files: compat/libusb-1.0/libusb/io.c
  compat/libusb-1.0/libusb/libusbi.h
  compat/libusb-1.0/libusb/os/linux_usbfs.h
@@ -298,12 +317,6 @@ Copyright: 2012, Luke Dashjr
 License: GPL-3+
  FIXME
 
-Files: driver-SPI-bitmine-A1.c
- spi-context.c
-Copyright: 2013-2014, Zefir Kurtisi <zefir.kurtisi at gmail.com>
-License: GPL-3+
- FIXME
-
 Files: compat/libusb-1.0/libusb/core.c
  compat/libusb-1.0/libusb/descriptor.c
 Copyright: 2001, Johannes Erdfelt <johannes at erdfelt.com>
@@ -466,6 +479,12 @@ Copyright: 2012-2014, Xiangfu <xiangfu at openmobilefree.com>
 License: GPL-3+
  FIXME
 
+Files: driver-spondoolies.h
+Copyright: 2014, Con Kolivas <kernel at kolivas.org>
+  2014, Zvi Shteingart - Spondoolies-tech.com
+License: GPL-3+
+ FIXME
+
 Files: hexdump.c
 Copyright: 2009, Daniel Mack <daniel at caiaq.de>
 License: GPL-3+
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
deleted file mode 100644
index c18b55f..0000000
--- a/debian/patches/format-security.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: build fails with -Werror=format-security
-Author: Scott Howard <showard at debian.org>
-
---- cgminer-4.2.3.orig/driver-bitmain.c
-+++ cgminer-4.2.3/driver-bitmain.c
-@@ -796,7 +796,7 @@ static void bitmain_update_temps(struct
- 	}
- 	sprintf(tmp, ", TempMAX: %dC", info->temp_max);
- 	strcat(msg, tmp);
--	applog(LOG_INFO, msg);
-+	applog(LOG_INFO, "%s", msg);
- 	info->temp_history_index++;
- 	info->temp_sum += bitmain->temp;
- 	applog(LOG_DEBUG, "%s%d: temp_index: %d, temp_count: %d, temp_max: %d",
diff --git a/debian/patches/kfreebsd_usb.patch b/debian/patches/kfreebsd_usb.patch
index e10848b..80d27bb 100644
--- a/debian/patches/kfreebsd_usb.patch
+++ b/debian/patches/kfreebsd_usb.patch
@@ -8,9 +8,9 @@ Description: FreeBSD's libusb-1.0 compatible library has a few differences
 Author: Scott Howard <showard at debian.org>
 Index: cgminer/cgminer.c
 ===================================================================
---- cgminer.orig/cgminer.c	2014-01-28 22:04:58.652348823 -0500
-+++ cgminer/cgminer.c	2014-01-28 22:04:58.648348823 -0500
-@@ -84,6 +84,12 @@
+--- cgminer.orig/cgminer.c	2014-05-21 16:52:32.377576608 -0400
++++ cgminer/cgminer.c	2014-05-21 16:52:32.369576607 -0400
+@@ -101,6 +101,12 @@
  #	define USE_FPGA
  #endif
  
diff --git a/debian/patches/series b/debian/patches/series
index c88da63..9a9d9b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 system_jansson.patch
 kfreebsd_usb.patch
-format-security.patch
diff --git a/debian/patches/system_jansson.patch b/debian/patches/system_jansson.patch
index 327c395..0ae66f0 100644
--- a/debian/patches/system_jansson.patch
+++ b/debian/patches/system_jansson.patch
@@ -3,9 +3,18 @@ Author: Scott Howard <showard at debian.org>
 
 Index: cgminer/configure.ac
 ===================================================================
---- cgminer.orig/configure.ac	2014-01-27 15:50:05.450815168 -0500
-+++ cgminer/configure.ac	2014-01-27 15:50:05.422815168 -0500
-@@ -337,8 +337,7 @@
+--- cgminer.orig/configure.ac	2014-05-21 17:23:14.593620390 -0400
++++ cgminer/configure.ac	2014-05-21 17:23:14.585620390 -0400
+@@ -374,8 +374,6 @@
+ 				;;
+ 		esac
+ 	else
+-		AC_CONFIG_SUBDIRS([compat/libusb-1.0])
+-		LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"
+ 		if test "x$have_linux" = "xtrue"; then
+ 			LIBUSB_LIBS+=" -ludev"
+ 		fi
+@@ -390,8 +388,7 @@
  
  AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno])
  
@@ -17,8 +26,8 @@ Index: cgminer/configure.ac
  
 Index: cgminer/compat/Makefile.am
 ===================================================================
---- cgminer.orig/compat/Makefile.am	2014-01-27 15:50:05.450815168 -0500
-+++ cgminer/compat/Makefile.am	2014-01-27 15:50:05.426815168 -0500
+--- cgminer.orig/compat/Makefile.am	2014-05-21 17:23:14.593620390 -0400
++++ cgminer/compat/Makefile.am	2014-05-21 17:23:14.585620390 -0400
 @@ -1,8 +1,6 @@
  
 -SUBDIRS	= jansson-2.5
@@ -28,3 +37,28 @@ Index: cgminer/compat/Makefile.am
 -SUBDIRS += libusb-1.0
  endif
  endif
+Index: cgminer/Makefile.am
+===================================================================
+--- cgminer.orig/Makefile.am	2014-05-21 17:23:14.593620390 -0400
++++ cgminer/Makefile.am	2014-05-21 17:23:14.585620390 -0400
+@@ -1,10 +1,10 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-JANSSON_CPPFLAGS= -I$(top_builddir)/compat/jansson-2.5/src -I$(top_srcdir)/compat/jansson-2.5/src
++JANSSON_CPPFLAGS=
+ 
+ if WANT_USBUTILS
+-USBUTILS_CPPFLAGS = -I$(top_builddir)/compat/libusb-1.0/libusb -I$(top_srcdir)/compat/libusb-1.0/libusb
++USBUTILS_CPPFLAGS = -I/usr/include/libusb-1.0
+ else
+ USBUTILS_CPPFLAGS =
+ endif
+@@ -16,7 +16,7 @@
+ 		  bitforce-firmware-flash.c hexdump.c ASIC-README \
+ 		  01-cgminer.rules
+ 
+-SUBDIRS		= lib compat ccan
++SUBDIRS		= lib ccan
+ 
+ cgminer_CPPFLAGS = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_CPPFLAGS) $(USBUTILS_CPPFLAGS)
diff --git a/debian/rules b/debian/rules
index 63fe952..e1eef41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,8 @@ DRIVERS= --enable-avalon \
          --enable-icarus \
          --enable-klondike \
          --enable-minion \
-         --enable-modminer
+         --enable-modminer \
+         --enable-spondoolies
 
 ifeq ($(DEB_BUILD_ARCH_OS),linux)
  DRIVERS+= --enable-knc \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/cgminer.git

More information about the Pkg-bitcoin-commits mailing list