1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84
|
The Debian packaging of prads is maintained in git, using the merging
workflow described in dgit-maint-merge(7). There isn't a patch queue
that can be represented as a quilt series.
A detailed breakdown of the changes is available from their canonical
representation - git commits in the packaging repository. For example,
to see the changes made by the Debian maintainer in the first upload
of upstream version 0.3.3, you could use:
% git clone https://git.dgit.debian.org/prads
% cd prads
% git log --oneline 0.3.3..debian/0.3.3-1 -- . ':!debian'
(If you have dgit, use `dgit clone prads`, rather than plain `git clone`.)
A single combined diff, containing all the changes, follows.
--- prads-0.3.3.orig/doc/prads.rc
+++ prads-0.3.3/doc/prads.rc
@@ -52,7 +52,7 @@ fi
case "$1" in
start)
- output=$(/bin/tempfile -s.prads)
+ output=$(mktemp --suffix=.prads)
log_daemon_msg "Starting $DESC"
log_progress_msg $NAME
if start-stop-daemon \
--- prads-0.3.3.orig/etc/eth.sig
+++ prads-0.3.3/etc/eth.sig
@@ -2883,8 +2883,8 @@
00:0B:5E Atmava Ltd
00:0B:5F Cisco Systems
00:0B:60 Cisco Systems
-00:0B:61 Friedrich Ltze Gmbh &co.
-00:0B:62 Ingenieurbro Ingo Mohnen
+00:0B:61 Friedrich Lütze Gmbh &co.
+00:0B:62 Ingenieurbüro Ingo Mohnen
00:0B:63 Private
00:0B:64 Kieback & Peter Gmbh & Co Kg
00:0B:65 Sy.a.c. Srl
@@ -2931,7 +2931,7 @@
00:0B:8E Ascent Corporation
00:0B:8F Akita Electronics Systems Co.,ltd.
00:0B:90 Covaro Networks, Inc.
-00:0B:91 Aglaia Gesellschaft Fr Bildverarbeitung Und Kommunikation M
+00:0B:91 Aglaia Gesellschaft Für Bildverarbeitung Und Kommunikation M
00:0B:92 Ascom Danmark A/s
00:0B:93 Barmag Electronic
00:0B:94 Digital Monitoring Products, Inc.
--- prads-0.3.3.orig/src/Makefile
+++ prads-0.3.3/src/Makefile
@@ -1,7 +1,7 @@
#Makefile
#CC=gcc
UNAME := $(shell uname -s)
-CFLAGS=-O3
+CFLAGS+=-O3
# for finding static libraries
LIBDIR=/usr/lib/x86_64-linux-gnu
--- prads-0.3.3.orig/src/output-plugins/log.h
+++ prads-0.3.3/src/output-plugins/log.h
@@ -19,8 +19,8 @@ typedef struct _output_plugin {
void *data; /* anything else */
} output_plugin;
-enum { LOG_STDOUT, LOG_FILE, LOG_FIFO, LOG_UNIFIED, LOG_SGUIL, LOG_RINGBUFFER, LOG_MAX } log_types;
-enum { VERBOSE = 0x01, FLAGS } log_flags;
+extern enum { LOG_STDOUT, LOG_FILE, LOG_FIFO, LOG_UNIFIED, LOG_SGUIL, LOG_RINGBUFFER, LOG_MAX } log_types;
+extern enum { VERBOSE = 0x01, FLAGS } log_flags;
void log_asset_arp (asset *main);
void log_asset_os (asset *main, os_asset *os, connection *cxt);
--- prads-0.3.3.orig/src/servicefp/servicefp.c
+++ prads-0.3.3/src/servicefp/servicefp.c
@@ -47,7 +47,7 @@
extern globalconfig config;
-servicelist *services[MAX_PORTS];
+extern servicelist *services[MAX_PORTS];
/* ----------------------------------------------------------
* FUNCTION : init_identification
|