November 2012 - openSUSE Commits - openSUSE Mailing Lists

commit nagios for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '12

30 Nov '12

Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at 2012-11-30 12:25:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nagios (Old) and /work/SRC/openSUSE:Factory/.nagios.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nagios", Maintainer is "lrupp(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/nagios/nagios.changes 2012-10-19 08:48:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2012-11-30 12:27:50.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Nov 26 11:35:24 UTC 2012 - aeszter(a)gwdg.de + +- Use usermod instead of groupmod when suse_version > 1220 due to + pwdutils/shadow switch. + +------------------------------------------------------------------- +Tue Nov 20 07:53:48 UTC 2012 - dimstar(a)opensuse.org + +- Fix useradd invocation: -o is useless without -u and newer + versions of pwdutils/shadowutils fail on this now. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.DHq2BW/_old 2012-11-30 12:27:51.000000000 +0100 +++ /var/tmp/diff_new_pack.DHq2BW/_new 2012-11-30 12:27:51.000000000 +0100 @@ -331,7 +331,7 @@ then : OK user %{nagios_user} already present else - useradd -r -o -g %{nagios_group} -s /bin/false -c "User for Nagios" -d %{nagios_localstatedir} %{nagios_user} 2> /dev/null || : + useradd -r -g %{nagios_group} -s /bin/false -c "User for Nagios" -d %{nagios_localstatedir} %{nagios_user} 2> /dev/null || : %{nnmmsg} "Added user %{nagios_user} for package %{name}" fi # update? @@ -341,7 +341,11 @@ : # %%{nagios_user} is already in %%nagios_command_group group else # Add %%{nagios_user} to %%nagios_command_group. + %if 0%{?suse_version} > 1220 + usermod -a -G %{nagios_command_group} %{nagios_user} + %else groupmod -A %{nagios_user} %{nagios_command_group} 2>/dev/null + %endif %{nnmmsg} "Added %{nagios_user} to %{nagios_command_group}" fi fi @@ -438,7 +442,11 @@ : # $wwwusr (default: %%nagios_command_user) is already in Nagios cmd group else # modify apache user, adding it to nagios_command_group + %if 0%{?suse_version} > 1220 + usermod -a -G %{nagios_command_group} $wwwusr + %else groupmod -A $wwwusr %{nagios_command_group} 2>/dev/null + %endif %nnmmsg "User $wwwusr added to group %{nagios_command_group} so sending commands to Nagios from the CGI is possible." fi # Update ? -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit multitail for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '12

30 Nov '12

Hello community, here is the log from the commit of package multitail for openSUSE:Factory checked in at 2012-11-30 12:25:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/multitail (Old) and /work/SRC/openSUSE:Factory/.multitail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "multitail", Maintainer is "mmj(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/multitail/multitail.changes 2012-02-17 12:06:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.multitail.new/multitail.changes 2012-11-30 12:27:46.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Nov 22 16:44:06 UTC 2012 - pascal.bleser(a)opensuse.org + +- update to 5.2.10: + * adds -N which sets the initial tail lines count for all following inputs + * configuration file parameter min_n_bufferlines was ignored + * added colorscheme for 'ADB-logging' (Android) + +------------------------------------------------------------------- Old: ---- multitail-5.2.9.tgz multitail-bufferoverflowstrncat.patch multitail-getaddrinfo.patch New: ---- multitail-5.2.10.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multitail.spec ++++++ --- /var/tmp/diff_new_pack.4M6jhm/_old 2012-11-30 12:27:47.000000000 +0100 +++ /var/tmp/diff_new_pack.4M6jhm/_new 2012-11-30 12:27:47.000000000 +0100 @@ -1,22 +1,32 @@ # vim: set ts=4 sw=4 et: -# Copyright (c) 2004-2010 oc2pus, pbleser -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. + +# Copyright (c) 2010-2012 Pascal Bleser <pascal.bleser(a)opensuse.org> +# 2004-2010 oc2pus +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ Name: multitail Summary: Tail Multiple Files -Version: 5.2.9 +Version: 5.2.10 Release: 0 Group: System/X11/Terminals License: GPL-2.0+ URL: http://www.vanheusden.com/multitail/ Source: http://www.vanheusden.com/multitail/multitail-%{version}.tgz -Patch1: multitail-bufferoverflowstrncat.patch Patch2: multitail-remove_date.patch -# PATCH-FIX-UPSTREAM multitail-getadddrinfo.patch - pascal.bleser(a)opensuse.org -- replaces IPv4 socket code with getaddrinfo which is more flexible, safe and supports IPv6, for sending to a syslog server and receiving syslog events in multitail -Patch3: multitail-getaddrinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: ncurses-devel make gcc +BuildRequires: ncurses-devel +BuildRequires: make +BuildRequires: gcc %description MultiTail lets you view one or multiple files like the original @@ -36,9 +46,7 @@ %prep %setup -q -%patch1 -p1 %patch2 -%patch3 %__sed -i 's/\r//g' manual.html %__chmod 644 manual.html ++++++ multitail-5.2.9.tgz -> multitail-5.2.10.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multitail-5.2.9/Makefile new/multitail-5.2.10/Makefile --- old/multitail-5.2.9/Makefile 2011-12-31 11:21:25.000000000 +0100 +++ new/multitail-5.2.10/Makefile 2012-11-22 13:51:01.000000000 +0100 @@ -3,6 +3,7 @@ DESTDIR=/ CONFIG_FILE=$(DESTDIR)/etc/multitail.conf +CC=gcc DEBUG=-g # -D_DEBUG # -pg # -D_DEBUG #-pg -W -pedantic # -pg #-fprofile-arcs LDFLAGS+=-lpanel -lncurses -lutil -lm $(DEBUG) -rdynamic # LDFLAGS+=-lc_p -lpanel_g -lncurses_g -lutil -lm -pg -g -rdynamic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multitail-5.2.9/cmdline.c new/multitail-5.2.10/cmdline.c --- old/multitail-5.2.9/cmdline.c 2011-12-31 11:21:25.000000000 +0100 +++ new/multitail-5.2.10/cmdline.c 2012-11-22 13:51:01.000000000 +0100 @@ -182,11 +182,16 @@ void add_redir_to_socket(char filtered, char *prio, char *fac, char *address, redirect_t **predir, int *n_redirect) { - struct hostent *hp; char *local_address = mystrdup(address, __FILE__, __PRETTY_FUNCTION__, __LINE__); char *colon = strchr(local_address, ':'); int prio_nr = -1, fac_nr = -1; int loop; + char* node; + char* service; + struct addrinfo hints; + struct addrinfo* result; + struct addrinfo* rp; + int s, sfd = -1; *predir = (redirect_t *)myrealloc(*predir, (*n_redirect) * sizeof(redirect_t), __FILE__, __PRETTY_FUNCTION__, __LINE__); @@ -199,21 +204,44 @@ (*predir)[*n_redirect].redirect = mystrdup(address, __FILE__, __PRETTY_FUNCTION__, __LINE__); - (*predir)[*n_redirect].fd = socket(AF_INET, SOCK_DGRAM, 0); - if ((*predir)[*n_redirect].fd == -1) - error_exit(__FILE__, __PRETTY_FUNCTION__, __LINE__, "Cannot create socket for redirecting via syslog protocol.\n"); - - memset(&(*predir)[*n_redirect].sai, 0x00, sizeof((*predir)[*n_redirect].sai)); - (*predir)[*n_redirect].sai.sin_family = AF_INET; if (colon) { *colon = 0x00; - (*predir)[*n_redirect].sai.sin_port = atoi(colon + 1); + node = local_address; + service = colon + 1; } else - (*predir)[*n_redirect].sai.sin_port = 514; - hp = gethostbyname(local_address); - memcpy(&(*predir)[*n_redirect].sai.sin_addr.s_addr, hp -> h_addr, hp -> h_length); + { + node = local_address; + service = "syslog"; + } + + memset(&hints, 0x00, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_DGRAM; + hints.ai_flags = 0; + hints.ai_protocol = 0; + + s = getaddrinfo(node, service, &hints, &result); + if (s != 0) + error_exit(__FILE__, __PRETTY_FUNCTION__, __LINE__, "Cannot create socket for redirecting via syslog protocol: %s.\n", gai_strerror(s)); + + for (rp = result; rp != NULL; rp = rp -> ai_next) + { + sfd = socket(rp -> ai_family, rp -> ai_socktype, rp -> ai_protocol); + if (sfd == -1) + continue; + if (connect(sfd, rp -> ai_addr, rp -> ai_addrlen) != -1) + break; + close(sfd); + } + + freeaddrinfo(result); + + if (rp == NULL) + error_exit(__FILE__, __PRETTY_FUNCTION__, __LINE__, "Cannot create socket for redirecting via syslog protocol.\n"); + + (*predir)[*n_redirect].fd = sfd; for(loop=0; loop<8; loop++) { @@ -550,7 +578,7 @@ int_array_t cur_color_schemes = { NULL, 0, 0 }; myattr_t cdef = { -1, -1 }; int window_height = -1; - int initial_n_lines_tail = -1; + int initial_n_lines_tail = min_n_bufferlines; char *win_title = NULL; term_t cur_term_emul = TERM_IGNORE; strip_t *pstrip = NULL; @@ -765,6 +793,10 @@ { initial_n_lines_tail = get_value_arg("-n", argv[++loop], VAL_ZERO_POSITIVE); } + else if (strcmp(argv[loop], "-N") == 0) + { + initial_n_lines_tail = min_n_bufferlines = get_value_arg("-n", argv[++loop], VAL_ZERO_POSITIVE); + } else if (strcmp(argv[loop], "-b") == 0) { tab_width = get_value_arg("-b", argv[++loop], VAL_ZERO_POSITIVE); @@ -1007,7 +1039,7 @@ /* see if file exists */ if (check_interval == 0 && is_cmd == 0 && is_stdin == 0 && is_sock == 0 && retry == 0 && stat64(dummy, &buf) == -1) { - fprintf(stderr, "Error opening file %s.\n", dummy); + fprintf(stderr, "Error opening file %s (%s)\n", dummy, strerror(errno)); exit(EXIT_FAILURE); } @@ -1039,7 +1071,7 @@ /* initial number of lines to tail */ cur -> initial_n_lines_tail = initial_n_lines_tail; - initial_n_lines_tail = -1; + initial_n_lines_tail = min_n_bufferlines; /* default window height */ cur -> win_height = window_height; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multitail-5.2.9/error.c new/multitail-5.2.10/error.c --- old/multitail-5.2.9/error.c 2011-12-31 11:21:25.000000000 +0100 +++ new/multitail-5.2.10/error.c 2012-11-22 13:51:01.000000000 +0100 @@ -21,19 +21,32 @@ void error_exit(char *file, const char *function, int line, char *format, ...) { va_list ap; + int index; + void *trace[128]; + int trace_size = backtrace(trace, 128); + char **messages = backtrace_symbols(trace, trace_size); (void)endwin(); fprintf(stderr, version_str, VERSION); fprintf(stderr, "\n\n"); - fprintf(stderr,"A problem occured at line %d in function %s (from file %s):\n\n", line, function, file); + fprintf(stderr, "The following error occured:\n"); + fprintf(stderr, "---------------------------\n"); va_start(ap, format); (void)vfprintf(stderr, format, ap); va_end(ap); - if (errno) fprintf(stderr, "\nerrno variable (if applicable): %d which means %s\n\n", errno, strerror(errno)); - fprintf(stderr, "\nBinary build at %s %s\n", __DATE__, __TIME__); + fprintf(stderr, "\n"); + fprintf(stderr, "\n"); + fprintf(stderr, "If this is a bug, please report the following information:\n"); + fprintf(stderr, "---------------------------------------------------------\n"); + fprintf(stderr, "This problem occured at line %d in function %s (from file %s):\n", line, function, file); + if (errno) fprintf(stderr, "errno variable was then: %d which means \"%s\"\n", errno, strerror(errno)); + fprintf(stderr, "Binary build at %s %s\n", __DATE__, __TIME__); + fprintf(stderr, "Execution path:\n"); + for(index=0; index<trace_size; ++index) + fprintf(stderr, "\t%d %s\n", index, messages[index]); dump_mem(SIGHUP); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multitail-5.2.9/globals.c new/multitail-5.2.10/globals.c --- old/multitail-5.2.9/globals.c 2011-12-31 11:21:25.000000000 +0100 +++ new/multitail-5.2.10/globals.c 2012-11-22 13:51:01.000000000 +0100 @@ -31,7 +31,7 @@ int *n_win_per_col = NULL; int *vertical_split = NULL; color_scheme *cschemes = NULL; -const char *version_str = " --*- multitail " VERSION " (C) 2003-2007 by folkert(a)vanheusden.com -*--"; +const char *version_str = " --*- multitail " VERSION " (C) 2003-2012 by folkert(a)vanheusden.com -*--"; conversion *conversions = NULL; keybinding *keybindings = NULL; pars_per_file *ppf = NULL; @@ -47,7 +47,7 @@ int terminal_main_index = -1; int default_color_scheme = -1; int max_y, max_x; -int min_n_bufferlines = 25; +int min_n_bufferlines = -1; int mode_statusline = 1; int n_children = 0; int n_conversions = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multitail-5.2.9/mt.c new/multitail-5.2.10/mt.c --- old/multitail-5.2.9/mt.c 2011-12-31 11:21:25.000000000 +0100 +++ new/multitail-5.2.10/mt.c 2012-11-22 13:51:01.000000000 +0100 @@ -385,7 +385,16 @@ void select_display_start_and_end(char *string, char mode, int wrap_offset, int win_width, int *prt_start, int *prt_end, int *disp_end) { - int nbytes = strlen(string); + /* patch by Thomas Gartner */ + int nbytes = 0; /* = strlen(string); */ + char *tmpString=string; + while(string && *tmpString) + { + if (*tmpString++==9) + nbytes += tab_width; + else + ++nbytes; + } *prt_start = 0; *prt_end = nbytes; @@ -455,7 +464,7 @@ return 0; } - + char find_highlight_matches(regmatch_t *matches, char use_regex, int offset) { int match_offset; @@ -482,65 +491,65 @@ myattr_t * find_cmatches_index(color_offset_in_line *cmatches, int n_cmatches, mybool_t has_merge_colors, int offset) { - static myattr_t final_color; - int cmatches_index = 0; - int fg_composed = -1, bg_composed = -1; - int attrs = -1; - char first_set = 1; - - for(cmatches_index=0; cmatches_index<n_cmatches; cmatches_index++) - { - if (offset >= cmatches[cmatches_index].start && offset < cmatches[cmatches_index].end) - { - if (has_merge_colors == MY_FALSE) - { - return &cmatches[cmatches_index].attrs; - } - - if (cmatches[cmatches_index].merge_color == MY_TRUE) - { - /* merge these colors */ - if (cmatches[cmatches_index].attrs.colorpair_index != -1) - { - int fg_fc, bg_fc; - - fg_fc = cp.fg_color[cmatches[cmatches_index].attrs.colorpair_index]; - bg_fc = cp.bg_color[cmatches[cmatches_index].attrs.colorpair_index]; - - if (fg_fc != -1 && fg_composed == -1) - fg_composed = fg_fc; - if (bg_fc != -1 && bg_composed == -1) - bg_composed = bg_fc; - } - - if (cmatches[cmatches_index].attrs.attrs != -1) - { - if (attrs == -1) - attrs = cmatches[cmatches_index].attrs.attrs; - else - attrs |= cmatches[cmatches_index].attrs.attrs; - } - } - else if (first_set) - { - first_set = 0; - - fg_composed = cp.fg_color[cmatches[cmatches_index].attrs.colorpair_index]; - bg_composed = cp.bg_color[cmatches[cmatches_index].attrs.colorpair_index]; - attrs = cmatches[cmatches_index].attrs.attrs; - } - } - } - - if (fg_composed != -1 || bg_composed != -1 || final_color.attrs != -1) - { - final_color.attrs = attrs; - final_color.colorpair_index = find_or_init_colorpair(fg_composed, bg_composed, 1); + static myattr_t final_color; + int cmatches_index = 0; + int fg_composed = -1, bg_composed = -1; + int attrs = -1; + char first_set = 1; + + for(cmatches_index=0; cmatches_index<n_cmatches; cmatches_index++) + { + if (offset >= cmatches[cmatches_index].start && offset < cmatches[cmatches_index].end) + { + if (has_merge_colors == MY_FALSE) + { + return &cmatches[cmatches_index].attrs; + } + + if (cmatches[cmatches_index].merge_color == MY_TRUE) + { + /* merge these colors */ + if (cmatches[cmatches_index].attrs.colorpair_index != -1) + { + int fg_fc, bg_fc; + + fg_fc = cp.fg_color[cmatches[cmatches_index].attrs.colorpair_index]; + bg_fc = cp.bg_color[cmatches[cmatches_index].attrs.colorpair_index]; + + if (fg_fc != -1 && fg_composed == -1) + fg_composed = fg_fc; + if (bg_fc != -1 && bg_composed == -1) + bg_composed = bg_fc; + } + + if (cmatches[cmatches_index].attrs.attrs != -1) + { + if (attrs == -1) + attrs = cmatches[cmatches_index].attrs.attrs; + else + attrs |= cmatches[cmatches_index].attrs.attrs; + } + } + else if (first_set) + { + first_set = 0; + + fg_composed = cp.fg_color[cmatches[cmatches_index].attrs.colorpair_index]; + bg_composed = cp.bg_color[cmatches[cmatches_index].attrs.colorpair_index]; + attrs = cmatches[cmatches_index].attrs.attrs; + } + } + } - return &final_color; - } + if (fg_composed != -1 || bg_composed != -1 || final_color.attrs != -1) + { + final_color.attrs = attrs; + final_color.colorpair_index = find_or_init_colorpair(fg_composed, bg_composed, 1); - return NULL; + return &final_color; + } + + return NULL; } void gen_wordwrap_offsets(char *string, int start_offset, int end_offset, int win_width, int **offsets) @@ -712,7 +721,7 @@ { char reverse = 0; myattr_t cdev = { -1, -1 }; - int prt_start = 0, prt_end, disp_end; + int prt_start = 0, prt_end = 0, disp_end = 0; int mx = -1; char use_regex = 0; color_offset_in_line *cmatches = NULL; @@ -863,7 +872,7 @@ /* check if the current line matches with a regular expression returns 0 if a regexp failed to execute - */ + */ /* this code can be optimized quit a bit but I wanted to get it to work quickly so I expanded everything (2006/03/28) */ char check_filter(proginfo *cur, char *string, regmatch_t **pmatch, char **error, int *matching_regex, char do_re, char *display) @@ -874,7 +883,8 @@ char re_exec_ok = 1; *error = NULL; - *pmatch = NULL; + if (pmatch) + *pmatch = NULL; *matching_regex = -1; *display = 1; @@ -2295,33 +2305,56 @@ { char *dummy = mystrdup(cur -> filename, __FILE__, __PRETTY_FUNCTION__, __LINE__); char *colon = strchr(dummy, ':'); - struct sockaddr_in sa; - socklen_t ssai_len = sizeof(sa); - char *host = "0.0.0.0"; - int port = 514; + struct addrinfo hints; + struct addrinfo* result; + struct addrinfo* rp; + int sfd, s; - cur -> wfd = cur -> fd = socket(AF_INET, SOCK_DGRAM, 0); - if (cur -> fd == -1) - error_exit(__FILE__, __PRETTY_FUNCTION__, __LINE__, "Failed to create socket for receiving syslog data.\n"); + char *host = NULL; + char *service = "syslog"; if (colon) { - port = atoi(colon + 1); - if (port <= 0) - error_exit(__FILE__, __PRETTY_FUNCTION__, __LINE__, "--[Ll]isten requires a >= 0 portnumber.\n"); + service = colon + 1; *colon = 0x00; if (colon > dummy) host = dummy; } - memset(&sa, 0x00, ssai_len); - sa.sin_family = AF_INET; - sa.sin_port = htons(port); - sa.sin_addr.s_addr = inet_addr(host); - if (bind(cur -> fd, (struct sockaddr *)&sa, ssai_len) == -1) - error_exit(__FILE__, __PRETTY_FUNCTION__, __LINE__, "Failed to bind socket to %s.\n", cur -> filename); + memset(&hints, 0x00, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_DGRAM; + hints.ai_flags = AI_PASSIVE; + hints.ai_protocol = 0; + hints.ai_canonname = NULL; + hints.ai_addr = NULL; + hints.ai_next = NULL; + + s = getaddrinfo(host, service, &hints, &result); + if (s != 0) + error_exit(__FILE__, __PRETTY_FUNCTION__, __LINE__, "Failed to create socket for receiving syslog data on %s: %s.\n", cur -> filename, gai_strerror(s)); + + for (rp = result; rp != NULL; rp = rp -> ai_next) + { + sfd = socket(rp -> ai_family, rp -> ai_socktype, rp -> ai_protocol); + if (sfd == -1) + continue; + if (bind(sfd, rp -> ai_addr, rp -> ai_addrlen) == 0) + break; + close(sfd); + } + + freeaddrinfo(result); + + if (rp == NULL) + error_exit(__FILE__, __PRETTY_FUNCTION__, __LINE__, "Failed to create socket for receiving syslog data on %s.\n", cur -> filename); + + cur -> wfd = cur -> fd = sfd; - myfree(dummy); + cur -> wfd = cur -> fd = socket(AF_INET, SOCK_DGRAM, 0); + if (cur -> fd == -1) + + myfree(dummy); cur -> pid = -1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multitail-5.2.9/mt.h new/multitail-5.2.10/mt.h --- old/multitail-5.2.9/mt.h 2011-12-31 11:21:25.000000000 +0100 +++ new/multitail-5.2.10/mt.h 2012-11-22 13:51:01.000000000 +0100 @@ -48,7 +48,7 @@ #define __USE_BSD /* manpage says _BSD_SOURCE, stdlib.h says __USE_BSD */ #endif -#if defined(sun) || defined(__sun) || defined(scoos) || defined(_HPUX_SOURCE) || defined(AIX) +#if defined(sun) || defined(__sun) || defined(scoos) || defined(_HPUX_SOURCE) || defined(AIX) || defined(__CYGWIN__) #include <ncurses/panel.h> #include <ncurses/ncurses.h> #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multitail-5.2.9/multitail.1 new/multitail-5.2.10/multitail.1 --- old/multitail-5.2.9/multitail.1 2011-12-31 11:21:25.000000000 +0100 +++ new/multitail-5.2.10/multitail.1 2012-11-22 13:51:01.000000000 +0100 @@ -103,6 +103,9 @@ .B "\-n" number_of_lines Number of lines to tail initially. The default depends on the size of the terminal-window. .TP +.B "\-N" number_of_lines +Like -n but this parameter will be used for all files/commands you tail after this parameter. +.TP .B "\-r" interval Restart the command (started with -l/-L) after it has exited. With interval you can set how long to sleep before restarting. .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multitail-5.2.9/multitail.conf new/multitail-5.2.10/multitail.conf --- old/multitail-5.2.9/multitail.conf 2011-12-31 11:21:25.000000000 +0100 +++ new/multitail-5.2.10/multitail.conf 2012-11-22 13:51:01.000000000 +0100 @@ -130,6 +130,30 @@ cs_re:yellow:Failed [^ ]* for [^ ]* from [^ ]* port [0-9]* .* cs_re:red:Disconnecting: Too many authentication failures for.* # +# ADB logcat +colorscheme:logcat +cs_re_s:blue,,bold:^./(dalvikvm)$ +cs_re_s:blue,,bold:^./(Process)\( +cs_re_s:cyan:^./(ActivityManager)\( +cs_re_s:cyan:^./(ActivityThread)\( +cs_re_s:white,,bold:^./([^\(]*)\( +cs_re_s:green:^[^\(]*(\()[^$]*(\)) +cs_re:red,,inverse:[Pp]ermission [Dd]eni[ae][dl] +cs_re:red,,inverse:Caused by: +cs_re:cyan:: +#cs_re:red,,inverse:^F +#cs_re:red,,bold:^E +#cs_re:yellow,,bold:^W +#cs_re:cyan,,bold:^I +#cs_re:green,,bold:^V +#cs_re:white:^D +cs_re_s:red,,inverse:^(F)/[^:]*: (.*)$ +cs_re_s:red:^(E)/[^:]*: (.*)$ +cs_re_s:yellow:^(W).[^:]*: (.*)$ +#cs_re_s:green:^(I).[^:]*: (.*)$ +cs_re_s:green:^(V)/[^:]*: (.*)$ +cs_re_s:black,,bold:^(D)/[^:]*: (.*)$ +# # linux iptables firewall colorscheme:liniptfw:Linux IPtables (2.6.x kernel) cs_re:cyan:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multitail-5.2.9/scrollback.c new/multitail-5.2.10/scrollback.c --- old/multitail-5.2.9/scrollback.c 2011-12-31 11:21:25.000000000 +0100 +++ new/multitail-5.2.10/scrollback.c 2012-11-22 13:51:01.000000000 +0100 @@ -746,6 +746,7 @@ if ((rc=regcomp(&reg, search_for, REG_EXTENDED | (case_insensitive == MY_TRUE?REG_ICASE:0)))) { regexp_error_popup(rc, &reg); + free(last_check); return; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multitail-5.2.9/ui.c new/multitail-5.2.10/ui.c --- old/multitail-5.2.9/ui.c 2011-12-31 11:21:25.000000000 +0100 +++ new/multitail-5.2.10/ui.c 2012-11-22 13:51:01.000000000 +0100 @@ -2449,7 +2449,7 @@ void regexp_error_popup(int rc, regex_t *pre) { - char popup_buffer[4096]; + char popup_buffer[4096] = { 0 }; char *error = convert_regexp_error(rc, pre); if (error) @@ -2465,7 +2465,9 @@ popup_buffer[sizeof(popup_buffer) - 1] = 0x00; } else - strncat(popup_buffer, error, sizeof(popup_buffer)); + { + strncat(popup_buffer, error, sizeof(popup_buffer)-strlen(popup_buffer)-1); + } myfree(error); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multitail-5.2.9/utils.c new/multitail-5.2.10/utils.c --- old/multitail-5.2.9/utils.c 2011-12-31 11:21:25.000000000 +0100 +++ new/multitail-5.2.10/utils.c 2012-11-22 13:51:01.000000000 +0100 @@ -4,6 +4,7 @@ #include <signal.h> #include <stdlib.h> #include <limits.h> +#include <stdio.h> #include <string.h> #include <sys/types.h> #include <regex.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multitail-5.2.9/version new/multitail-5.2.10/version --- old/multitail-5.2.9/version 2011-12-31 11:21:25.000000000 +0100 +++ new/multitail-5.2.10/version 2012-11-22 13:51:01.000000000 +0100 @@ -1 +1 @@ -VERSION=5.2.9 +VERSION=5.2.10 ++++++ multitail-remove_date.patch ++++++ --- /var/tmp/diff_new_pack.4M6jhm/_old 2012-11-30 12:27:47.000000000 +0100 +++ /var/tmp/diff_new_pack.4M6jhm/_new 2012-11-30 12:27:47.000000000 +0100 @@ -1,10 +1,10 @@ ---- error.c.orig 2011-01-20 07:22:09.000000000 +0100 -+++ error.c 2011-01-20 07:22:18.000000000 +0100 -@@ -33,7 +33,6 @@ - va_end(ap); - if (errno) fprintf(stderr, "\nerrno variable (if applicable): %d which means %s\n\n", errno, strerror(errno)); - -- fprintf(stderr, "\nBinary build at %s %s\n", __DATE__, __TIME__); - - dump_mem(SIGHUP); - +--- error.c.orig 2012-11-22 17:45:25.818717396 +0100 ++++ error.c 2012-11-22 17:45:31.848713134 +0100 +@@ -43,7 +43,6 @@ + fprintf(stderr, "---------------------------------------------------------\n"); + fprintf(stderr, "This problem occured at line %d in function %s (from file %s):\n", line, function, file); + if (errno) fprintf(stderr, "errno variable was then: %d which means \"%s\"\n", errno, strerror(errno)); +- fprintf(stderr, "Binary build at %s %s\n", __DATE__, __TIME__); + fprintf(stderr, "Execution path:\n"); + for(index=0; index<trace_size; ++index) + fprintf(stderr, "\t%d %s\n", index, messages[index]); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libvisio for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '12

30 Nov '12

Hello community, here is the log from the commit of package libvisio for openSUSE:Factory checked in at 2012-11-30 12:25:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvisio (Old) and /work/SRC/openSUSE:Factory/.libvisio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvisio", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libvisio/libvisio.changes 2012-11-22 16:38:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvisio.new/libvisio.changes 2012-11-30 12:27:14.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 29 10:58:33 CET 2012 - fridrich.strba(a)suse.com + +- Bump version to 0.0.22 + +------------------------------------------------------------------- Old: ---- libvisio-0.0.21.tar.xz New: ---- libvisio-0.0.22.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvisio.spec ++++++ --- /var/tmp/diff_new_pack.PYhT8T/_old 2012-11-30 12:27:16.000000000 +0100 +++ /var/tmp/diff_new_pack.PYhT8T/_new 2012-11-30 12:27:16.000000000 +0100 @@ -19,7 +19,7 @@ %define libname libvisio-0_0-0 Name: libvisio -Version: 0.0.21 +Version: 0.0.22 Release: 0 License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Summary: Library for parsing the MS Visio file format structure -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit jing for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '12

30 Nov '12

Hello community, here is the log from the commit of package jing for openSUSE:Factory checked in at 2012-11-30 12:25:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jing (Old) and /work/SRC/openSUSE:Factory/.jing.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jing", Maintainer is "orphaned(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/jing/jing.changes 2011-12-12 17:01:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.jing.new/jing.changes 2012-11-30 12:26:00.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 29 15:02:09 UTC 2012 - mvyskocil(a)suse.com + +- used saxon9 for build and as a dependency (bnc#780666) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jing.spec ++++++ --- /var/tmp/diff_new_pack.6geD0l/_old 2012-11-30 12:26:01.000000000 +0100 +++ /var/tmp/diff_new_pack.6geD0l/_new 2012-11-30 12:26:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package jing # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,34 +15,32 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: jing Summary: Validator for RELAX NG in Java +License: BSD-3-Clause +Group: Productivity/Publishing/XML Version: 20091111 -Release: 1 +Release: 0 Url: http://code.google.com/p/jing-trang/ Source: http://jing-trang.googlecode.com/files/%{name}-%{version}.zip Source1: %{name}.script Source2: %{name}-doc.tar.bz2 -License: BSD-3-Clause -Group: Productivity/Publishing/XML BuildRoot: %{_tmppath}/%{name}-%{version}-build # -BuildRequires: unzip -BuildRequires: saxon BuildRequires: jpackage-utils +BuildRequires: saxon9 +BuildRequires: unzip BuildRequires: xerces-j2 -BuildRequires: xml-commons-resolver BuildRequires: xml-commons-apis +BuildRequires: xml-commons-resolver # -Requires: jre -Requires: saxon +Requires: jaxp_parser_impl Requires: jpackage-utils -Requires: xml-commons-resolver +Requires: jre +Requires: saxon9 Requires: xml-commons-apis -Requires: jaxp_parser_impl +Requires: xml-commons-resolver # Requires: jre BuildArch: noarch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit jakarta-commons-compress for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '12

30 Nov '12

Hello community, here is the log from the commit of package jakarta-commons-compress for openSUSE:Factory checked in at 2012-11-30 12:25:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jakarta-commons-compress (Old) and /work/SRC/openSUSE:Factory/.jakarta-commons-compress.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jakarta-commons-compress", Maintainer is "bnc-team-java(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/jakarta-commons-compress/jakarta-commons-compress.changes 2011-09-23 02:03:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jakarta-commons-compress.new/jakarta-commons-compress.changes 2012-11-30 12:25:55.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 29 14:57:33 UTC 2012 - mvyskocil(a)suse.com + +- use saxon and saxon-scripts only when using maven + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-commons-compress.spec ++++++ --- /var/tmp/diff_new_pack.4VhZCT/_old 2012-11-30 12:25:56.000000000 +0100 +++ /var/tmp/diff_new_pack.4VhZCT/_new 2012-11-30 12:25:56.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package jakarta-commons-compress (Version 1.0) +# spec file for package jakarta-commons-compress # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ Name: jakarta-commons-compress Version: 1.0 -Release: 2 +Release: 0 Summary: Commons Compress License: Apache-2.0 Group: Development/Libraries/Java @@ -47,6 +47,7 @@ BuildRequires: jakarta-commons-io BuildRequires: junit %if %with maven +BuildRequires: maven-surefire-plugin BuildRequires: maven2 BuildRequires: maven2-plugin-compiler BuildRequires: maven2-plugin-install @@ -54,10 +55,9 @@ BuildRequires: maven2-plugin-javadoc BuildRequires: maven2-plugin-resources BuildRequires: maven2-plugin-site -BuildRequires: maven-surefire-plugin -%endif BuildRequires: saxon BuildRequires: saxon-scripts +%endif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,7 +68,6 @@ %package javadoc -License: Apache-2.0 Summary: Commons Compress Group: Development/Libraries/Java -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit irqd for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '12

30 Nov '12

Hello community, here is the log from the commit of package irqd for openSUSE:Factory checked in at 2012-11-30 12:24:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/irqd (Old) and /work/SRC/openSUSE:Factory/.irqd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "irqd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/irqd/irqd.changes 2012-05-07 22:47:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.irqd.new/irqd.changes 2012-11-30 12:25:51.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Nov 29 16:27:38 UTC 2012 - jengelh(a)inai.de + +- Update to new upstream release 0.7.0 +* Support for assigning NICs to cpusets +* Support for Broadom and Intel Gigabit queue names +* Support for non-RPS +- Snapshot 0.7.0+git14 +* Support for XPS +- Delete 0001-libnl3-compile-fix.diff, 0002-libnl3-link-fix.diff, + 0003-va_list-va_list_NULL-fix.diff (merged upstream) + +------------------------------------------------------------------- Old: ---- 0001-libnl3-compile-fix.diff 0002-libnl3-link-fix.diff 0003-va_list-va_list_NULL-fix.diff irqd-0.6.3.tar.xz New: ---- irqd-0.7.0.g14.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irqd.spec ++++++ --- /var/tmp/diff_new_pack.j3Aa8K/_old 2012-11-30 12:25:52.000000000 +0100 +++ /var/tmp/diff_new_pack.j3Aa8K/_new 2012-11-30 12:25:52.000000000 +0100 @@ -17,7 +17,7 @@ Name: irqd -Version: 0.6.3 +Version: 0.7.0.g14 Release: 0 Summary: Multiqueue and RPS-aware IRQ affinity balancer License: GPL-2.0 @@ -27,20 +27,18 @@ Source: %name-%version.tar.xz Source2: irqd.init Source3: irqd.service -# PATCH-FIX-UPSTREAM 0001-libnl3-compile-fix.diff status=sent,accepted -Patch1: 0001-libnl3-compile-fix.diff -# PATCH-FIX-UPSTREAM 0002-libnl3-link-fix.diff status=sent,accepted -Patch2: 0002-libnl3-link-fix.diff -# PATCH-FIX-UPSTREAM 0003-va_list-va_list_NULL-fix.diff status=notsentyet,notacceptedyet -Patch3: 0003-va_list-va_list_NULL-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake +BuildRequires: bison +BuildRequires: flex BuildRequires: libtool +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%endif BuildRequires: xz BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(libnl-3.0) -BuildRequires: pkgconfig(libnl-route-3.0) +BuildRequires: pkgconfig(libnl-route-3.0) >= 3.2 %description irqd is an alternative IRQ balancer for Linux kernels. It balances @@ -52,12 +50,11 @@ %prep %if 0%{?__xz:1} -%setup -q +%setup -qn %name %else tar -xf "%{S:0}" --use=xz; -%setup -DTq +%setup -DTqn %name %endif -%patch -P 1 -P 2 -p1 -P 3 -p1 %build if [ ! -e configure ]; then @@ -68,15 +65,42 @@ %install b="%buildroot"; -%makeinstall -mkdir -p "$b/%_initrddir" "$b/lib/systemd/system"; +make install DESTDIR="$b"; +mkdir -p "$b/%_initrddir"; install -pm0755 "%{S:2}" "$b/%_initrddir/irqd"; -install -pm0644 "%{S:3}" "$b/lib/systemd/system/irqd.service"; +%if 0%{?_unitdir:1} +mkdir -p "$b/%_unitdir"; +install -pm0644 "%{S:3}" "$b/%_unitdir/irqd.service"; +%endif + +%if 0%{?_unitdir:1} +%pre +%service_add_pre irqd.service +%endif + +%post +%if 0%{?_unitdir:1} +%service_add_post irqd.service +%endif +%restart_on_update irqd + +%if 0%{?_unitdir:1} +%preun +%service_del_preun irqd.service +%endif + +%if 0%{?_unitdir:1} +%postun +%service_del_postun irqd.service +%endif %files %defattr(-,root,root) %_initrddir/irqd -/lib/systemd/system/irqd.service +%if 0%{?_unitdir:1} +%_unitdir +%endif %_sbindir/irqd +%doc DESIGN README %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hyper-v for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '12

30 Nov '12

Hello community, here is the log from the commit of package hyper-v for openSUSE:Factory checked in at 2012-11-30 12:21:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hyper-v (Old) and /work/SRC/openSUSE:Factory/.hyper-v.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hyper-v", Maintainer is "OHering(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/hyper-v/hyper-v.changes 2012-11-02 17:36:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hyper-v.new/hyper-v.changes 2012-11-30 12:25:40.000000000 +0100 @@ -1,0 +2,29 @@ +Tue Nov 27 11:19:32 CET 2012 - ohering(a)suse.de + +- update hv_set_ifconfig, use single index for static ipv4/ipv6 [bnc#790469] + +------------------------------------------------------------------- +Sun Nov 25 17:50:40 CET 2012 - ohering(a)suse.de + +- update hv_set_ifconfig further to work with our ifcfg [bnc#790469] + +------------------------------------------------------------------- +Thu Nov 22 18:14:12 CET 2012 - ohering(a)suse.de + +- update hv_get_dhcp_info to work with our ifcfg [bnc#790469] +- remove cat usage from hv_get_dns_info +- add quoting to hv_set_ifconfig to make it more robust + +------------------------------------------------------------------- +Mon Nov 12 17:18:25 CET 2012 - ohering(a)suse.de + +- remove code to build kmp, it was not enabled because the + drivers are now in kernel since a long time. [bnc#676890] + +------------------------------------------------------------------- +Thu Nov 8 14:30:05 CET 2012 - ohering(a)suse.de + +- Netlink source address validation allows DoS [bnc#791605, CVE-2012-5532] + bugfix for recvfrom check from bnc#761200 + +------------------------------------------------------------------- @@ -33 +62 @@ -- check origin of netlink messages, use recvfrom() [bnc#761200] +- check origin of netlink messages, use recvfrom() [bnc#761200, CVE-2012-2669] Old: ---- Module.supported full-kernel-version.patch hyper-v.dummy_ko.c hyper-v.supplements.txt hyperv_pvdrivers.conf kmp_filelist no-loopback.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hyper-v.spec ++++++ --- /var/tmp/diff_new_pack.27S5S3/_old 2012-11-30 12:25:41.000000000 +0100 +++ /var/tmp/diff_new_pack.27S5S3/_new 2012-11-30 12:25:41.000000000 +0100 @@ -16,21 +16,9 @@ # -%define with_kmp 0 -%define with_modprobe 0 -%if %{with_kmp} -%define with_drivers_in_kmp 0 -%endif %define hv_kvp_daemon hv_kvp_daemon Name: hyper-v -%if %{with_kmp} -BuildRequires: kernel-default-devel -BuildRequires: module-init-tools -%ifarch %ix86 -BuildRequires: kernel-pae-devel -%endif -%endif ExclusiveArch: %ix86 x86_64 PreReq: %insserv_prereq Summary: Microsoft Hyper-V tools @@ -41,11 +29,6 @@ Url: http://www.kernel.org Version: 4 Release: 0 -Source: Module.supported -Source1: hyperv_pvdrivers.conf -Source2: kmp_filelist -Source3: hyper-v.supplements.txt -Source4: hyper-v.dummy_ko.c Source5: hyper-v.kvptest.ps1.txt Source9: hyper-v.include.linux.hyperv.h Source10: hyper-v.tools.hv.hv_kvp_daemon.c @@ -53,44 +36,17 @@ Source20: hyper-v.tools.hv.hv_get_dhcp_info.sh Source21: hyper-v.tools.hv.hv_get_dns_info.sh Source22: hyper-v.tools.hv.hv_set_ifconfig.sh -Patch0: full-kernel-version.patch -Patch1: no-loopback.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{with_kmp} -%if %{with_drivers_in_kmp} -%suse_kernel_module_package -n hyper-v um xen -f kmp_filelist -%else -%suse_kernel_module_package -n hyper-v um xen -f kmp_filelist -p hyper-v.supplements.txt -%endif -%endif %description This package contains the Microsoft Hyper-V tools. - - -%if %{with_kmp} - -%package KMP - -Summary: Microsoft Hyper-V drivers -Group: System/Kernel - -%description KMP -This package contains the Microsoft Hyper-V drivers. - - - -%endif - %prep %setup -Tc cp -avL %{S:5} kvptest.ps1.txt cp -vL %{S:9} %{hv_kvp_daemon}.h cp -vL %{S:10} %{hv_kvp_daemon}.c -%patch0 -p3 -%patch1 -p3 %build sed -i~ '/#include <linux.hyperv.h>/d' %{hv_kvp_daemon}.c @@ -104,31 +60,8 @@ -DCN_KVP_IDX=0x9 \ -DCN_KVP_VAL=0x1 \ -o %{hv_kvp_daemon} -%if %{with_kmp} -for flavor in %flavors_to_build; do -%if %{with_drivers_in_kmp} - krel=$(make -s -C %{kernel_source $flavor} kernelrelease) - cp -a /lib/modules/$krel/source/drivers/staging/hv $flavor -%else - rm -rfv $flavor - mkdir -p $flavor - cp %_sourcedir/hyper-v.dummy_ko.c $flavor/hyper-v.suse_kmp_dummy.c - cat > $flavor/Makefile <<-EOF -obj-m += hyper-v.suse_kmp_dummy.o -EOF -%endif - cp %_sourcedir/Module.supported $flavor - make -C %{kernel_source $flavor} modules M=$PWD/$flavor -done -%endif %install -%if %{with_kmp} -export INSTALL_MOD_PATH=$RPM_BUILD_ROOT -for flavor in %flavors_to_build; do - make -C %{kernel_source $flavor} modules_install M=$PWD/$flavor -done -%endif mkdir -p $RPM_BUILD_ROOT/usr/sbin install -m755 %{hv_kvp_daemon} $RPM_BUILD_ROOT/usr/sbin mkdir -p $RPM_BUILD_ROOT/usr/lib/%{name}/bin @@ -139,20 +72,10 @@ mkdir -p $RPM_BUILD_ROOT/etc/init.d install -m755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/%{hv_kvp_daemon} ln -sfvbn ../../etc/init.d/%{hv_kvp_daemon} $RPM_BUILD_ROOT/usr/sbin/rc%{hv_kvp_daemon} -%if %{with_modprobe} -mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d -install -m644 %SOURCE1 $RPM_BUILD_ROOT/etc/modprobe.d/hyperv_pvdrivers.conf -%endif %files %defattr (-,root,root) %doc kvptest.ps1.txt -%if %{with_modprobe} -%if !%{with_kmp} -%dir /etc/modprobe.d -%config /etc/modprobe.d/hyperv_pvdrivers.conf -%endif -%endif /etc/init.d/%{hv_kvp_daemon} /usr/sbin/rc%{hv_kvp_daemon} /usr/sbin/%{hv_kvp_daemon} ++++++ hyper-v.tools.hv.hv_get_dhcp_info.sh ++++++ --- /var/tmp/diff_new_pack.27S5S3/_old 2012-11-30 12:25:41.000000000 +0100 +++ /var/tmp/diff_new_pack.27S5S3/_new 2012-11-30 12:25:41.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/bash -# This example script retrieves the DHCP state of a given interface. +# This script retrieves the DHCP state of a given interface. # In the interest of keeping the KVP daemon code free of distro specific # information; the kvp daemon code invokes this external script to gather # DHCP setting for the specific interface. @@ -16,9 +16,9 @@ # this script can be based on the Network Manager APIs for retrieving DHCP # information. -if_file="/etc/sysconfig/network-scripts/ifcfg-"$1 +if_file="/etc/sysconfig/network/ifcfg-$1" -dhcp=$(grep "dhcp" $if_file 2>/dev/null) +dhcp=$(grep -- '^BOOTPROTO=.*dhcp' "$if_file" 2>/dev/null) if [ "$dhcp" != "" ]; then ++++++ hyper-v.tools.hv.hv_get_dns_info.sh ++++++ --- /var/tmp/diff_new_pack.27S5S3/_old 2012-11-30 12:25:41.000000000 +0100 +++ /var/tmp/diff_new_pack.27S5S3/_new 2012-11-30 12:25:41.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/bash -# This example script parses /etc/resolv.conf to retrive DNS information. +# This script parses /etc/resolv.conf to retrive DNS information. # In the interest of keeping the KVP daemon code free of distro specific # information; the kvp daemon code invokes this external script to gather # DNS information. @@ -10,4 +10,7 @@ # this script can be based on the Network Manager APIs for retrieving DNS # entries. -cat /etc/resolv.conf 2>/dev/null | awk '/^nameserver/ { print $2 }' +if test -r /etc/resolv.conf +then + awk -- '/^nameserver/ { print $2 }' /etc/resolv.conf +fi ++++++ hyper-v.tools.hv.hv_kvp_daemon.c ++++++ --- /var/tmp/diff_new_pack.27S5S3/_old 2012-11-30 12:25:41.000000000 +0100 +++ /var/tmp/diff_new_pack.27S5S3/_new 2012-11-30 12:25:41.000000000 +0100 @@ -43,6 +43,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <dirent.h> +#include <net/if.h> /* * KVP protocol: The user mode component first registers with the @@ -88,6 +89,7 @@ static char *os_minor = ""; static char *processor_arch; static char *os_build; +static char *os_version; static char *lic_version = "Unknown version"; static struct utsname uts_buf; @@ -453,7 +455,9 @@ char *p, buf[512]; uname(&uts_buf); - os_build = uts_buf.release; + os_version = uts_buf.release; + os_build = strdup(uts_buf.release); + os_name = uts_buf.sysname; processor_arch = uts_buf.machine; @@ -462,7 +466,7 @@ * string to be of the form: x.y.z * Strip additional information we may have. */ - p = strchr(os_build, '-'); + p = strchr(os_version, '-'); if (p) *p = '\0'; @@ -879,7 +883,7 @@ addr_length = INET6_ADDRSTRLEN; } - if ((length - *offset) < addr_length + 1) + if ((length - *offset) < addr_length + 2) return HV_E_FAIL; if (str == NULL) { strcpy(buffer, "inet_ntop failed\n"); @@ -887,11 +891,13 @@ } if (*offset == 0) strcpy(buffer, tmp); - else + else { + strcat(buffer, ";"); strcat(buffer, tmp); - strcat(buffer, ";"); + } *offset += strlen(str) + 1; + return 0; } @@ -953,7 +959,9 @@ * supported address families; if not we gather info on * the specified address family. */ - if ((family != 0) && (curp->ifa_addr->sa_family != family)) { + if ((((family != 0) && + (curp->ifa_addr->sa_family != family))) || + (curp->ifa_flags & IFF_LOOPBACK)) { curp = curp->ifa_next; continue; } @@ -1478,13 +1486,19 @@ len = recvfrom(fd, kvp_recv_buffer, sizeof(kvp_recv_buffer), 0, addr_p, &addr_l); - if (len < 0 || addr.nl_pid) { + if (len < 0) { syslog(LOG_ERR, "recvfrom failed; pid:%u error:%d %s", addr.nl_pid, errno, strerror(errno)); close(fd); return -1; } + if (addr.nl_pid) { + syslog(LOG_WARNING, "Received packet from untrusted pid:%u", + addr.nl_pid); + continue; + } + incoming_msg = (struct nlmsghdr *)kvp_recv_buffer; incoming_cn_msg = (struct cn_msg *)NLMSG_DATA(incoming_msg); hv_msg = (struct hv_kvp_msg *)incoming_cn_msg->data; @@ -1649,7 +1663,7 @@ strcpy(key_name, "OSMinorVersion"); break; case OSVersion: - strcpy(key_value, os_build); + strcpy(key_value, os_version); strcpy(key_name, "OSVersion"); break; case ProcessorArchitecture: ++++++ hyper-v.tools.hv.hv_set_ifconfig.sh ++++++ --- /var/tmp/diff_new_pack.27S5S3/_old 2012-11-30 12:25:41.000000000 +0100 +++ /var/tmp/diff_new_pack.27S5S3/_new 2012-11-30 12:25:41.000000000 +0100 @@ -41,43 +41,145 @@ : expect configuration datafile as first argument exit 1 fi -# +# send subshell output to syslog ( +f=/etc/sysconfig/network/scripts/functions +if test -f ${f} +then + . ${f} +else + echo "MISSING ${f}" + exit 1 +fi +# remove known config variables from environment +unset HWADDR unset DHCP unset IF_NAME +unset ${!IPADDR*} +unset ${!NETMASK*} +unset ${!GATEWAY*} +unset ${!IPV6ADDR*} +unset ${!IPV6NETMASK*} +unset ${!IPV6_DEFAULTGW*} +unset ${!DNS*} . "$1" +# if test -z "${IF_NAME}" then echo "Missing IF_NAME= in ${cfg}" exit 1 fi # -t=`mktemp` -if test -z "${t}" -then - exit 1 -fi - +t_ifcfg=`mktemp` +t_ifroute=`mktemp` _exit() { - rm -f "${t}" + rm -f "${t_ifcfg}" "${t_ifroute}" } trap _exit EXIT # -cat >> "${t}" <<_EOF_ -# contents from $0 $* -`cat "${cfg}"` +if test -z "${t_ifcfg}" || test -z "${t_ifroute}" +then + exit 1 +fi # -# additional options: -STARTMODE=auto -_EOF_ +# Create ifcfg-* file +( + echo "STARTMODE=auto" + # + if test -n "${HWADDR}" + then + : # ignore HWADDR, it just repeats the existing MAC value + fi + # + if test "${DHCP}" = "yes" + then + echo "BOOTPROTO=dhcp" + fi + # single index for all ipv4 and ipv6 adresses in final ifcfg file + i=0 + idx="" + # loop through all ipv4 adresses + for var in ${!IPADDR*} + do + index=${var#IPADDR} + pfx= + # find corresponding NETMASK variable + eval nm=\$NETMASK${index} + # if specified, calculate prefix + if test -n "${nm}" + then + pfx=`mask2pfxlen "${nm}" 2>/dev/null` + fi + # if not specified, force prefix + if test -z "${pfx}" + then + pfx="32" + fi + # construct actual value + eval val=\$IPADDR${index} + # write config variable + echo "IPADDR${idx}='${val}/${pfx}'" + idx="_$((++i))" + done + # loop through all ipv6 adresses + for var in ${!IPV6ADDR*} + do + index=${var#IPV6ADDR} + # find corresponding IPV6NETMASK variable + eval pfx=\$IPV6NETMASK${index} + # if not specified, force prefix + if test -z "${pfx}" + then + pfx=128 + fi + # construct actual value + eval val=\$IPV6ADDR${index} + # write config variable + echo "IPADDR${idx}='${val}/${pfx}'" + idx="_$((++i))" + done + +) >> "${t_ifcfg}" -if test "${DHCP}" = "yes" +# Create ifroute-* file +( + if test -n "${GATEWAY}" + then + echo "default $GATEWAY - $IF_NAME" + fi + if test -n "${IPV6_DEFAULTGW}" + then + echo "default $IPV6_DEFAULTGW - $IF_NAME" + fi +) >> "${t_ifroute}" +# Only a single default gateway is supported +unset GATEWAY IPV6_DEFAULTGW +if test -n "${!GATEWAY*}${!IPV6_DEFAULTGW*}" then - echo "BOOTPROTO=dhcp" >> ${t}; + echo "WARNING: multiple gateways not supported: ${!GATEWAY*} ${!IPV6_DEFAULTGW*}" fi +# collect DNS info +_DNS_= +for var in ${!DNS*} +do + eval val=\$${var} + if test -n "${_DNS_}" + then + _DNS_="${_DNS_} ${val}" + else + _DNS_=${val} + fi +done +# echo "$0: working on network interface ifcfg-${IF_NAME}" -cp -b ${t} /etc/sysconfig/network/ifcfg-${IF_NAME} -ifdown ${IF_NAME} -o hotplug -ifup ${IF_NAME} -o hotplug +cp -fb ${t_ifcfg} "/etc/sysconfig/network/ifcfg-${IF_NAME}" +cp -fb ${t_ifroute} "/etc/sysconfig/network/ifroute-${IF_NAME}" +if test -w /etc/sysconfig/network/config +then + sed -i "s@^NETCONFIG_DNS_STATIC_SERVERS=.*@NETCONFIG_DNS_STATIC_SERVERS='$_DNS_'@" /etc/sysconfig/network/config + netconfig update -m dns +fi +ifdown "${IF_NAME}" +ifup "${IF_NAME}" ) 2>&1 | logger -t "${0##*/}[$PPID / $$]" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit graphite2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '12

30 Nov '12

Hello community, here is the log from the commit of package graphite2 for openSUSE:Factory checked in at 2012-11-30 12:21:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/graphite2 (Old) and /work/SRC/openSUSE:Factory/.graphite2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "graphite2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/graphite2/graphite2.changes 2012-11-14 09:13:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.graphite2.new/graphite2.changes 2012-11-30 12:25:21.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Nov 28 16:36:00 UTC 2012 - crrodriguez(a)opensuse.org + +- graphite2-arm.patch :Fix build in arm and possible other platforms, we should + notuse -nodefaultlibs as a linker flag and let the system + do its job automatically. +- freetype-devel should be freetype2-devel + +------------------------------------------------------------------- New: ---- graphite2-arm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ graphite2.spec ++++++ --- /var/tmp/diff_new_pack.whL4Bb/_old 2012-11-30 12:25:22.000000000 +0100 +++ /var/tmp/diff_new_pack.whL4Bb/_new 2012-11-30 12:25:22.000000000 +0100 @@ -1,5 +1,4 @@ # -# # spec file for package graphite2 # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. @@ -22,16 +21,17 @@ Name: graphite2 Version: 1.2.0 Release: 0 -License: LGPL-2.1+ or GPL-2.0+ or MPL-1.1 Summary: Font rendering capabilities for complex non-Roman writing systems -Url: http://sourceforge.net/projects/silgraphite/ +License: LGPL-2.1+ or GPL-2.0+ or MPL-1.1 Group: Productivity/Publishing/Word +Url: http://sourceforge.net/projects/silgraphite/ Source0: http://downloads.sourceforge.net/silgraphite/graphite2-%{version}.tgz -BuildRequires: pkgconfig BuildRequires: cmake +BuildRequires: freetype2-devel BuildRequires: gcc-c++ -BuildRequires: freetype-devel +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: graphite2-arm.patch %description Graphite2 is a project within SIL’s Non-Roman Script Initiative and Language @@ -57,6 +57,7 @@ Summary: Files for Developing with %{name} Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} +Requires: glibc-devel %description devel Graphite2 is a project within SIL’s Non-Roman Script Initiative and Language @@ -70,10 +71,11 @@ %prep %setup -q - +%patch0 %build cmake \ - -DCMAKE_C_FLAGS:STRING="%{optflags}" \ + -DCMAKE_C_FLAGS:STRING="%{optflags} -D_GNU_SOURCE" \ + -DCMAKE_CXX_FLAGS:STRING="%{optflags} -D_GNU_SOURCE" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ @@ -83,12 +85,12 @@ %endif -DGRAPHITE2_COMPARE_RENDERER=OFF \ -DVM_MACHINE_TYPE=direct \ - . + -DCMAKE_VERBOSE_MAKEFILE=ON + make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install - rm %{buildroot}%{_libdir}/*.la %post -n %{libname} -p /sbin/ldconfig ++++++ graphite2-arm.patch ++++++ --- tests/CMakeLists.txt.orig +++ tests/CMakeLists.txt @@ -39,14 +39,12 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windo COMPILE_DEFINITIONS "GRAPHITE2_STATIC;GRAPHITE2_NTRACING;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE") else (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") set_target_properties(graphite2-base PROPERTIES - COMPILE_FLAGS "-Wall -Wextra -fdiagnostics-show-option -fno-rtti -fno-exceptions -fno-stack-protector" + COMPILE_FLAGS "-Wall -Wextra -fdiagnostics-show-option -fno-rtti -fno-exceptions" COMPILE_DEFINITIONS "GRAPHITE2_STATIC" - LINK_FLAGS "-nodefaultlibs" LINKER_LANGUAGE C) set_target_properties(graphite2-segcache PROPERTIES - COMPILE_FLAGS "-Wall -Wextra -fdiagnostics-show-option -fno-rtti -fno-exceptions -fno-stack-protector" + COMPILE_FLAGS "-Wall -Wextra -fdiagnostics-show-option -fno-rtti -fno-exceptions" COMPILE_DEFINITIONS "GRAPHITE2_STATIC;GRAPHITE2_NTRACING" - LINK_FLAGS "-nodefaultlibs" LINKER_LANGUAGE C) endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") --- gr2fonttest/CMakeLists.txt.orig +++ gr2fonttest/CMakeLists.txt @@ -16,7 +16,7 @@ target_link_libraries(gr2fonttest graphi if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") # -lgcc LINKER_LANGUAGE C add_definitions(-fno-rtti -fno-exceptions) - set_target_properties(gr2fonttest PROPERTIES LINK_FLAGS "-nodefaultlibs" LINKER_LANGUAGE C) + set_target_properties(gr2fonttest PROPERTIES LINKER_LANGUAGE C) set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") # This script just fails nolib_test(stdc++ $<TARGET_FILE:gr2fonttest>) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gpg-offline for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '12

30 Nov '12

Hello community, here is the log from the commit of package gpg-offline for openSUSE:Factory checked in at 2012-11-30 12:21:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpg-offline (Old) and /work/SRC/openSUSE:Factory/.gpg-offline.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gpg-offline", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gpg-offline/gpg-offline.changes 2012-11-28 10:33:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gpg-offline.new/gpg-offline.changes 2012-11-30 12:21:09.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Nov 29 19:47:36 CET 2012 - sbrabec(a)suse.cz + +- Fix return code of --verify. +- Fix invalid concatenation of keyrings in --add. +- Add --list. +- Improve verbose output. +- Do not use %{sources}. It is incompatible with old rpm. +- Add more options to rpm macros. +- Add PACKAGING.HOWTO. +- Improve texts. + +------------------------------------------------------------------- Old: ---- gpg-offline.man New: ---- gpg-offline.PACKAGING.HOWTO gpg-offline.man.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpg-offline.spec ++++++ --- /var/tmp/diff_new_pack.haDSXt/_old 2012-11-30 12:21:10.000000000 +0100 +++ /var/tmp/diff_new_pack.haDSXt/_new 2012-11-30 12:21:10.000000000 +0100 @@ -15,19 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gpg-offline Version: 0.1 Release: 0 Summary: Trusted GPG Offline Keyring Manipulation Tool -Group: Hardware/Other License: GPL-2.0+ +Group: Hardware/Other Source: %{name}.gopts Source1: %{name}.COPYING Source2: genopts Source3: %{name}.macros -Source4: %{name}.man +Source4: %{name}.man.in +Source5: %{name}.PACKAGING.HOWTO BuildRequires: gpg2 -Requires: diffutils gpg2 +Requires: diffutils +Requires: gpg2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -43,10 +46,12 @@ %prep %setup -q -T -c -cp -a %{sources} . +cp -a %{S:0} %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} . mv %{name}.COPYING COPYING +mv %{name}.PACKAGING.HOWTO PACKAGING.HOWTO %build +sed s:@docdir@:%{_docdir}/%{name}:g <%{name}.man.in >%{name}.man bash ./genopts %{name} %install @@ -60,7 +65,7 @@ %files %defattr(-,root,root) -%doc COPYING +%doc COPYING PACKAGING.HOWTO %{_bindir}/* %doc %{_mandir}/man1/*.* /etc/rpm/macros.* ++++++ gpg-offline.PACKAGING.HOWTO ++++++ Packaging with gpg-offline ========================== gpg-offline allows packager to use and verify signatures independently on network access. It makes possible to verify signatures in a network-less sandboxes. Contents: First time adding to the spec file Prepare if I have only a trusted signature Prepare if I already have a trusted keyring Common step: create spec file Version upgrade in the spec file Signing key was changed in upstream Package review Automatic check Build Service use First time adding to the spec file ---------------------------------- GPG signature verification expects presence of signer in the web of trust. It is often not true for packaging upstream packages. So you have to trust them using inferior methods, e. g. time continuity: Signature downloaded a year ago uses the same signing key as the current one. Prepare if I have only a trusted signature - - - - - - - - - - - - - - - - - - - - - If you have a trusted signature and you want to create keyring: gpg --verify mypackage.tar.gz.sig Online GPG verification will be performed. You will get a text containing description and ID of the signing key. Pick the key ID from the output and and call: gpg-offline --package={my_package} --add {key_id} Example: ~/OSC/openSUSE:Factory/libnetfilter_acct> gpg --verify *.sig gpg: Signature made Tue Oct 9 00:42:06 2012 CEST using RSA key ID BB5F58CC gpg: Good signature from "Netfilter Core Team <coreteam(a)netfilter.org>" gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. Primary key fingerprint: 57FF 5E9C 9AA6 7A86 0B55 7AF7 A411 1F89 BB5F 58CC ~/OSC/openSUSE:Factory/libnetfilter_acct> gpg-offline --package=${PWD##*/} --add BB5F58CC gpg: key BB5F58CC: "Netfilter Core Team <coreteam(a)netfilter.org>" not changed gpg: Total number processed: 1 gpg: unchanged: 1 Prepare if I already have a trusted keyring - - - - - - - - - - - - - - - - - - - - - - gpg-offline keyrings are standard armored GPG keyrings that contains text header that must exactly match to the keyring contents. If you already have a trusted keyring in another format (e. g. plain or armored keyring without a header), it is easy to convert it to gpg-offline format. Rename it to {my_package}.keyring, and the use gpg-offline --refresh command. The command will present an error to you, but you can silently ignore it: Yes, you are aware that text header does not match (or does not exist). (You can use --offline option to perform only the refresh and don't search keyservers.) Example: ~/OSC/openSUSE:Factory/apache2> gpg-offline --package=${PWD##*/} --refresh ... ERROR: apache2.keyring is a valid armored GPG keyring, but the the human readable description does not correspond to its contents. It could be only a cosmetic change, but it may also indicate malicious keyring. ... If you really want to accept these changes, please finish it by call: mv apache2.keyring.new apache2.keyring ~/OSC/openSUSE:Factory/apache2> mv apache2.keyring.new apache2.keyring ~/OSC/openSUSE:Factory/apache2> Common step: create spec file - - - - - - - - - - - - - - - Suppose that you have a signature and {my_package}.keyring. You are ready to edit the spec file. Spec file preamble should contain the tarball, the signature and the keyring and require the gpg-offline package: Source: http://{url_path_to_your_project}/%{name}-%{version}.tar.bz2 +Source1: http://{url_path_to_your_project}/%{name}-%{version}.tar.bz2.sig +Source2: %{name}.keyring +BuildRequires: gpg-offline And %prep section should perform the verification step: %prep +%gpg_verify %{S:1} %setup -q (See /etc/rpm/gpg-offline.macros comments for all available options of %gpg_verify.) You are done! Version upgrade in the spec file -------------------------------- If you are upgrading the version, you have to upgrade the signature as well. If the signing key did not change, you are done. If the signing key changed, please do additional steps to verify, that the new signing key is valid. There is a risk of a malicious signature using malicious signing key! Do not blindly trust the sigining key header! Using gpg-offline --add and gpg-offline --delete commands upgrade your keyring. Submit the package and describe signing key change to the reviewer. Signing key was changed in upstream -------------------------------- If the signing key changed in upstream (new signature, expiration change etc., please use gpg-offline --refresh command. Submit the package and describe signing key change to the reviewer. Package review -------------- Verify that %gpg_verify is properly called in the %prep or %build stage. If you are unsure about the signing key, you can verify the keyring online by gpg-offline --review. You should always see OK message: {my_package}.keyring is a valid armored GPG keyring and the human readable description corresponds to its contents. Take special care if the public key is not present on upstream servers. (But it is generally OK to not upload their public keys to keyserver and publish trusted public key in an another way.) Example: ~/OSC/openSUSE:Factory/libnetfilter_acct> gpg-offline --package=${PWD##*/} --review gpg: refreshing 1 key from hkp://subkeys.pgp.net gpg: requesting key BB5F58CC from hkp server subkeys.pgp.net gpg: key BB5F58CC: "Netfilter Core Team <coreteam(a)netfilter.org>" 3 new signatures gpg: Total number processed: 1 gpg: new signatures: 3 gpg: no ultimately trusted keys found pub 4096R/BB5F58CC 2010-10-21 [expires: 2015-10-20] uid Netfilter Core Team <coreteam(a)netfilter.org> sub 4096R/04B92F5C 2010-10-21 [expires: 2015-10-20] libnetfilter_acct.keyring is a valid armored GPG keyring and the human readable description corresponds to its contents. Automatic check --------------- You can also perform automatic check by gpg-offline --review --offline. If will only check, that packager did not falsified keyring header, and nothing else. This check can be performed offline and you can use return code to fail. Example: ~/OSC/openSUSE:Factory/libnetfilter_acct> gpg-offline --package=${PWD##*/} --review --offline pub 4096R/BB5F58CC 2010-10-21 [expires: 2015-10-20] uid Netfilter Core Team <coreteam(a)netfilter.org> sub 4096R/04B92F5C 2010-10-21 [expires: 2015-10-20] libnetfilter_acct.keyring is a valid armored GPG keyring and the human readable description corresponds to its contents. Build Service use ----------------- If you need to build your package for older products and don't want to mess spec file with %ifs, you can link or aggregate gpg-offline from devel:tools:building or use following trick with "osc meta prjconf": --- Cut here ---- %if 0%{?suse_version} <= 1220 Substitute: gpg-offline %endif Macros: %gpg_verify(dnf) \ %if 0%{?suse_version} > 1220\ echo "WARNING: Using %%gpg_verify macro from prjconf, not from gpg-offline package."\ gpg-offline --directory="%{-d:%{-d*}}%{!-d:%{_sourcedir}}" --package="%{-n:%{-n*}}%{!-n:%{name}}""%{-f: %{-f*}}" --verify %{**}\ %else\ echo "WARNING: Dummy prjconf macro. gpg-offline is not available, skipping %{**} GPG signature verification!"\ %endif\ %nil ----------------- ++++++ gpg-offline.gopts ++++++ --- /var/tmp/diff_new_pack.haDSXt/_old 2012-11-30 12:21:10.000000000 +0100 +++ /var/tmp/diff_new_pack.haDSXt/_new 2012-11-30 12:21:10.000000000 +0100 @@ -41,15 +41,15 @@ Offline verify files in packages that they are signed by selected signatures. Manipulate selected signatures in keyring. -@option FILE -f --keyring=FILE -specifies keyring file - @option PACKAGE -p --package=PACKAGE specifies package name (i. e. file name without suffix, equivalent to --keyring="${DIR:-$PWD}/$PACKAGE.keyring") @option DIRECTORY --directory=DIR --package searches for keyring in DIR +@option FILE -f --keyring=FILE +specifies keyring file + @switch ADD -a --add Adds keys specified in ARGUMENT for inclusion to the package trusted keyring (run in the source directory) @@ -61,12 +61,15 @@ @switch REVIEW -r --review reviews the keyring and its human readable corresponds with the contents -@switch VERIFY -c --verify -verifies signature of selected source files - @switch REFRESH -R --refresh refreshes the keyring and its human readable corresponds with the contents +@switch LIST -l --list +lists keyring contents (exactly equal to --review --offline) + +@switch VERIFY -c --verify +verifies signature of selected source files + @switch OFFLINE -O --offline does not verify up-to-date status online (use with --review or --refresh) @@ -78,13 +81,38 @@ shopt -s nullglob -# vrun comment command args -# verbose echo and run command -function vrun { +# vvrun comment command args +# verbose level 0: run command and redirect stderr to /dev/null +# verbose level 1: run command +# verbose level >=2: echo and run command +function vrun2 { if $OPTARG_VERBOSE ; then - echo >&2 -e "\\n$1" + if test $OPTCNT_VERBOSE -gt 1 ; then + echo >&2 -e "\\n$1" + shift + echo >&2 " $*" + else + shift + fi + "$@" + else shift - echo >&2 " $*" + "$@" 2>/dev/null + fi +} + +# vvrun comment command args +# verbose level <2: run command +# verbose level >=2: echo and run command +function vvrun { + if $OPTARG_VERBOSE ; then + if test $OPTCNT_VERBOSE -gt 1 ; then + echo >&2 -e "\\n$1" + shift + echo >&2 " $*" + else + shift + fi else shift fi @@ -92,11 +120,11 @@ } function temp_setup { - TEMP=~/.gpg-upstream-keys/ + TEMP=~/.gpg-offline/ # Note: we use ~/.gnupg to prevent problems inside osc generated paths containing ":". rm -rf ${TEMP}key.$$ ${TEMP}keyring.$$ ${TEMP}keyringdesc.$$ ${TEMP}keyringdesc.no-expired-string.$$ ~/.gnupg/gpg-offline.$$* - mkdir -p ~/.gpg-upstream-keys - trap "eval rm -rf ${TEMP}key.$$ ${TEMP}keyring.$$ ${TEMP}keyringdesc.$$ ${TEMP}keyringdesc.no-expired-string.$$ ~/.gnupg/gpg-offline.$$* \$TEMP_FILES ; rmdir --ignore-fail-on-non-empty ~/.gpg-upstream-keys" EXIT + mkdir -p ~/.gpg-offline + trap "eval rm -rf ${TEMP}key.$$ ${TEMP}keyring.$$ ${TEMP}keyringdesc.$$ ${TEMP}keyringdesc.no-expired-string.$$ ~/.gnupg/gpg-offline.$$* \$TEMP_FILES ; rmdir --ignore-fail-on-non-empty ~/.gpg-offline" EXIT } # keyring_add keyring_op keyring_from keyring_to @@ -107,39 +135,39 @@ temp_setup if test -f $2 ; then - vrun "Import existing keyring to the temporary keyring:"\ + vrun2 "Import existing keyring to the temporary keyring:"\ gpg --no-default-keyring --keyring gpg-offline.$$ --import <$2 fi keyring_op_$1 - vrun "Export the keyring in ASCII form:"\ + vvrun "Export the keyring in ASCII form:"\ gpg --no-default-keyring --keyring gpg-offline.$$ --armor --export-options no-export-attributes,export-clean,export-minimal --export >${TEMP}keyring.$$ # Set locale to C for byte-to-byte reproducibility, but keep UTF-8 CTYPE to get international characters readable. - LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 vrun "List the human readable contents of the keyring:"\ + LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 vvrun "List the human readable contents of the keyring:"\ gpg --no-default-keyring --list-options show-unusable-uids,show-unusable-subkeys --keyring gpg-offline.$$ --list-keys | sed '1,/^--/d' >${TEMP}keyringdesc.$$ # Make sure that description is time independent. Convert "expired" to "expires". sed 's/ \[expired/ [expires/' <${TEMP}keyringdesc.$$ >${TEMP}keyringdesc.no-expired-string.$$ - vrun "Create new keyring and prepare spec:"\ - cat ${TEMP}keyringdesc.no-expired-string.$$ ${TEMP}keyring.$$ >>$3 + vvrun "Create new keyring and prepare spec:"\ + cat ${TEMP}keyringdesc.no-expired-string.$$ ${TEMP}keyring.$$ >$3 } # keyring_op: Add keys specified in the command line arguments. function keyring_op_add { TEMP_FILES="${TEMP}key.$$" for ID in "${ARGV[@]}" ; do - vrun "Extract minimal form of the key $ID in binary form:"\ + vvrun "Extract minimal form of the key $ID in binary form:"\ gpg --armor --export-options no-export-attributes,export-clean,export-minimal --export "$ID" >${TEMP}key.$$ - vrun "Import the new key to the temporary keyring:"\ + vvrun "Import the new key to the temporary keyring:"\ gpg --no-default-keyring --keyring gpg-offline.$$ --import <${TEMP}key.$$ done } function keyring_op_delete { TEMP_FILES="" - vrun "Delete specified keys from the temporary keyring:"\ + vvrun "Delete specified keys from the temporary keyring:"\ gpg --no-default-keyring --keyring gpg-offline.$$ --delete-keys "${ARGV[@]}" } @@ -147,21 +175,21 @@ TEMP_FILES="${TEMP}review.$$ ${TEMP}keyringdesc.no-expire-info.$$ ${TEMP}keyringdesc.extracted.no-expire-info.$$ ${TEMP}keyringdesc.extracted.$$" if ! $OPTARG_OFFLINE ; then - vrun "Refreshing keys from the key server:"\ + vvrun "Refreshing keys from the key server:"\ gpg --no-default-keyring --keyring gpg-offline.$$ --refresh-keys fi } function filespec_required { - if $OPTARG_PACKAGE ; then - if $OPTARG_DIRECTORY ; then - KEYRING="$OPTVAL_DIRECTORY/$OPTVAL_PACKAGE.keyring" - else - KEYRING="$OPTVAL_PACKAGE.keyring" - fi + if $OPTARG_FILE ; then + KEYRING="$OPTVAL_FILE" else - if $OPTARG_FILE ; then - KEYRING="$OPTVAL_FILE" + if $OPTARG_PACKAGE ; then + if $OPTARG_DIRECTORY ; then + KEYRING="$OPTVAL_DIRECTORY/$OPTVAL_PACKAGE.keyring" + else + KEYRING="$OPTVAL_PACKAGE.keyring" + fi else echo >&2 "$0: You must specify either --package or --file to use this command." exit 1 @@ -187,13 +215,13 @@ RC=$? if $SPEC_MODIFY ; then echo -e "\\nIf not yet done, please add following lines to $OPTVAL_PACKAGE.spec and submit:\\n" - echo "Source{#}: %{name}.keyring" + echo "Source2: %{name}.keyring" + echo "BuildRequires: gpg-offline" echo "" echo "And in %prep section:" echo "" echo "%gpg_verify %{S:1}" - echo " or" - echo "%gpg_verify -n keyring_name_without_suffix %{S:1}" + echo "" echo "(where %{S:1} is the signature)" echo " By submitting this change, you certify, that you verified, that the @@ -215,17 +243,22 @@ if $OPTARG_VERIFY ; then filespec_required keyring_required + temp_setup + TEMP_FILES="${TEMP}stderr.$$" + RC=0 rm -rf ~/.gnupg/gpg-offline.$$* - trap "rm -rf ~/.gnupg/gpg-offline.$$*" EXIT -# vrun "Import armored $KEYRING to the temporary keyring:"\ + # Enable once FIXME below will be fixed and disable temp_setup above. + #trap "rm -rf ~/.gnupg/gpg-offline.$$*" EXIT + vvrun "Import armored $KEYRING to the temporary keyring:"\ gpg --no-default-keyring --keyring gpg-offline.$$ --import <"$KEYRING" for SIGNATURE in "${ARGV[@]}" ; do - vrun "Verifying $SIGNATURE against the temporary keyring only:"\ - gpg --trust-model=always --keyserver-options=no-auto-key-retrieve --no-default-keyring --keyring=gpg-offline.$$ --verify "$SIGNATURE" 2>&1 | - # FIXME: Get rid this warning! - grep -v '^gpg: WARNING: Using untrusted key!$' >&2 + vvrun "Verifying $SIGNATURE against the temporary keyring only:"\ + gpg --trust-model=always --keyserver-options=no-auto-key-retrieve --no-default-keyring --keyring=gpg-offline.$$ --verify "$SIGNATURE" 2>${TEMP}stderr.$$ let RC+=$? + # FIXME: Get rid this warning! + # We have to use temporary file, otherwise return code gets lost. + grep -v '^gpg: WARNING: Using untrusted key!$' ${TEMP}stderr.$$ >&2 done if test $RC -gt 0 ; then exit 1 @@ -233,13 +266,16 @@ exit 0 fi -if test $OPTARG_REVIEW -o $OPTARG_REFRESH ; then +if test $OPTARG_REVIEW -o $OPTARG_REFRESH -o $OPTARG_LIST ; then + if $OPTARG_LIST ; then + OPTARG_OFFLINE=true + fi filespec_required keyring_required if $OPTARG_REFRESH ; then REVIEW="$KEYRING.new" else - TEMP=~/.gpg-upstream-keys/ + TEMP=~/.gpg-offline/ REVIEW=${TEMP}review.$$ fi temp_setup @@ -252,7 +288,9 @@ if $OPTARG_REFRESH ; then echo >&2 -e "$KEYRING is already up to date and needs no refresh." else - echo >&2 -e "$KEYRING is a valid armored GPG keyring and the human readable description corresponds to its contents." + if ! $OPTARG_LIST ; then + echo >&2 -e "$KEYRING is a valid armored GPG keyring\\nand the human readable description corresponds to its contents." + fi fi rm "$REVIEW" exit 0 @@ -264,9 +302,9 @@ if cmp -s ${TEMP}keyringdesc.extracted.no-expire-info.$$ ${TEMP}keyringdesc.no-expire-info.$$ ; then # It seems that the author only extended the signature validity or revoked. - echo >&2 -e "ERROR: $KEYRING is a valid armored GPG keyring and the human readable description corresponds to its contents, but there is a validity info update." + echo >&2 -e "ERROR: $KEYRING is a valid armored GPG keyring\\nand the human readable description corresponds to its contents,\\nbut there is a validity info update." else - echo >&2 -e "ERROR: $KEYRING is a valid armored GPG keyring, but the the human readable description does not correspond to its contents. It could be only a cosmetic change, but it may also indicate malicious keyring." + echo >&2 -e "ERROR: $KEYRING is a valid armored GPG keyring,\\nbut the the human readable description does not correspond to its contents.\\nIt could be only a cosmetic change, but it may also indicate malicious keyring." fi diff ${TEMP}keyringdesc.extracted.$$ ${TEMP}keyringdesc.no-expired-string.$$ @@ -274,7 +312,7 @@ # We do not force-perform this action. There may be race condition change of upstream keyring between --review and --refresh. echo >&2 -e "If you really want to accept these changes, please finish it by call:\\nmv $REVIEW $KEYRING" else - echo >&2 -e "If you are sure that it is OK, and you can perform keyring change, please call:\\n$0 -f $KEYRING --refresh\\nand then follow hints." + echo >&2 -e "If you are sure that it is OK, and you can perform keyring change,\\nplease call:\\n$0 -f $KEYRING --refresh\\nand then follow hints." fi # We always return 1 here. Offline tests should never have problem with revocation or key expiration change, # online tests should consider it as an error. ++++++ gpg-offline.macros ++++++ --- /var/tmp/diff_new_pack.haDSXt/_old 2012-11-30 12:21:10.000000000 +0100 +++ /var/tmp/diff_new_pack.haDSXt/_new 2012-11-30 12:21:10.000000000 +0100 @@ -13,9 +13,11 @@ # %gpg_verify %{S:1} # or # %gpg_verify -n keyring_name_without_suffix %{S:1} +# %gpg_verify -d directory_for_searching_of_the_keyring -n keyring_name_without_suffix %{S:1} +# %gpg_verify -f full_keyring_name_with_path %{S:1} # Note: %{S:1} is the signature, not the tarball. # -%gpg_verify(n:) \ -gpg-offline --directory=%{_sourcedir} --package="%{-n:%{-n*}}%{!-n:%{name}}" --verify %{**}\ +%gpg_verify(dnf) \ +gpg-offline --directory="%{-d:%{-d*}}%{!-d:%{_sourcedir}}" --package="%{-n:%{-n*}}%{!-n:%{name}}""%{-f: %{-f*}}" --verify %{**}\ %nil ++++++ gpg-offline.man.in ++++++ .TH gpg-offline "1" "November 2012" "GPG Offline" "GPG Offline Keyring Manipulation" .SH NAME gpg-offline \- trusted GPG offline keyring manipulation tool .SH SYNOPSIS .B gpg-offline \fI[OPTION]\fR \fI[ARGUMENT]\fR... Meaning of \fI[ARGUMENT]\fR depends on the mode of operations. .SH DESCRIPTION Offline gpg verification tool can verify signatures in ARGUMENT list and manipulate with selected signatures in offline keyrings. .PP Mandatory arguments to long options are mandatory for short options too. .TP \fB\-p\fR, \fB\-\-package\fR=\fIPACKAGE\fR specify the package (either \fB\-\-package\fR or \fB\-\-keyring\fR are mandatory) Tool will access file named .FN \fIPACKAGE\fR.keyring in the directory specified by \fB\-\-package\fR. .TP \fB\-\-directory\fR \fIDIR\fR specifies directory where .FN \fIPACKAGE\fR.keyring will be searched. .TP \fB\-f\fR, \fB\-\-keyring\fR=\fIFILE\fR specifies the keyring file. .IP Either \fB\-\-package\fR or \fB\-\-keyring\fR are mandatory. If you specify both, \fB\-\-keyring\fR takes precedence over \fB\-\-package\fR. .TP \fB\-a\fR, \fB\-\-add\fR \fIKEY_ID\fR... adds signing key(s) KEY_ID of upstream package for inclusion to the keyring file. If the file does not exist, it is created and needed lines are proposed for inclusion to \fIPACKAGE\fR.spec. .IP This command needs correctly configured gnupg and may need to contact keyring servers on Internet. .TP \fB\-d\fR, \fB\-\-delete\fR \fIKEY_ID\fR... removes signing key(s) KEY_ID of upstream package from the keyring file. .TP \fB\-c\fR, \fB\-\-verify\fR \fISIGNATURE\fR... verifies that the signature is valid. Signature is validated only against keys included in the keyring file. Any other keys are not accepted. .IP Verification is safe in offline environment without network access. .TP \fB\-c\fR, \fB\-\-review\fR reviews the keyring file: Checks that the human readable header corresponds to its contents. If \fB\-\-offline\fR is not specified, check online for keys updates. .TP \fB\-c\fR, \fB\-\-refresh\fR refreshes the keyring file: Update the human readable header according to its contents. If \fB\-\-offline\fR is not specified, check online for keys updates. .TP \fB\-v\fR, \fB\-\-offline\fR skips online checks in \fB\-\-review\fR and \fB\-\-refresh\fR. .TP \fB\-v\fR, \fB\-\-verbose\fR explains what is being done. Use twice to see even more. .TP \fB\-\-help\fR displays help and exits. .TP \fB\-\-version\fR outputs version information and exits. .PP The keyring file contains trusted keyring for particular package and contains keys that can be used for signing source tarballs of the package. Signature is considered as valid only if its signing key is part of trusted keyring for the package in question. .PP .B gpg-offline keyrings are standard armored GPG keyrings that contains text header that must exactly match to the keyring contents. .SH FILES @docdir@/PACKAGING.HOWTO Instructions for packagers. .SH AUTHOR Written by Stanislav Brabec, SUSE Linux .SH "REPORTING BUGS" Report bugs to sbrabec(a)suse.cz .SH COPYRIGHT Copyright \(co 2012 Stanislav Brabec, SUSE Linux .br License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>. .br This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. .SH "SEE ALSO" .BR gpg2 (1) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dmraid for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '12

30 Nov '12

Hello community, here is the log from the commit of package dmraid for openSUSE:Factory checked in at 2012-11-30 12:20:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dmraid (Old) and /work/SRC/openSUSE:Factory/.dmraid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dmraid", Maintainer is "NFBrown(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/dmraid/dmraid.changes 2012-07-10 13:40:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dmraid.new/dmraid.changes 2012-11-30 12:20:57.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 28 12:07:36 UTC 2012 - rmilasan(a)suse.com + +- Move lock file to /run/lock so it wont interfere with systemd. + +------------------------------------------------------------------- New: ---- dmraid-move-var-lock-to-run-lock.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmraid.spec ++++++ --- /var/tmp/diff_new_pack.FO4WEb/_old 2012-11-30 12:20:59.000000000 +0100 +++ /var/tmp/diff_new_pack.FO4WEb/_new 2012-11-30 12:20:59.000000000 +0100 @@ -16,13 +16,13 @@ # - Name: dmraid BuildRequires: autoconf BuildRequires: automake BuildRequires: device-mapper-devel BuildRequires: libselinux-devel BuildRequires: zlib-devel +Requires: aaa_base Requires: kpartx Url: http://people.redhat.com/~heinzm/sw/dmraid/src/ Summary: A Device-Mapper Software RAID Support Tool @@ -43,6 +43,7 @@ Patch5: remove_trylock Patch6: rebuild.fix Patch7: ddf-erase +Patch8: dmraid-move-var-lock-to-run-lock.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq @@ -81,6 +82,7 @@ %patch5 -p2 %patch6 -p1 %patch7 -p1 +%patch8 -p1 cp %{SOURCE3} . %build ++++++ boot.dmraid ++++++ --- /var/tmp/diff_new_pack.FO4WEb/_old 2012-11-30 12:20:59.000000000 +0100 +++ /var/tmp/diff_new_pack.FO4WEb/_new 2012-11-30 12:20:59.000000000 +0100 @@ -33,6 +33,9 @@ DMRAID_DEVICE_TIMEOUT=0 fi +# make sure /run/lock exists as /run is tmpfs +[ -d /run/lock ] || mkdir -p /run/lock >/dev/null 2>&1 + rc_reset case "$1" in ++++++ dmraid-move-var-lock-to-run-lock.patch ++++++ Index: 1.0.0.rc16/lib/locking/locking.c =================================================================== --- 1.0.0.rc16.orig/lib/locking/locking.c +++ 1.0.0.rc16/lib/locking/locking.c @@ -12,7 +12,7 @@ #include "internal.h" /* File locking private data. */ -static const char *lock_file = "/var/lock/dmraid/.lock"; +static const char *lock_file = "/run/lock/dmraid/.lock"; static int lf = -1; /* flock file. */ ++++++ mkinitrd-boot.sh ++++++ --- /var/tmp/diff_new_pack.FO4WEb/_old 2012-11-30 12:20:59.000000000 +0100 +++ /var/tmp/diff_new_pack.FO4WEb/_new 2012-11-30 12:20:59.000000000 +0100 @@ -16,6 +16,7 @@ ## root_dmraid=1 use device mapper raid ## +[ -d /run/lock ] || mkdir -p /run/lock >/dev/null 2>&1 /sbin/dmraid -a y -p wait_for_events -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0