November 2017 - openSUSE Commits - openSUSE Mailing Lists

commit sendmail for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package sendmail for openSUSE:Factory checked in at 2017-11-30 12:45:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sendmail (Old) and /work/SRC/openSUSE:Factory/.sendmail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sendmail" Thu Nov 30 12:45:51 2017 rev:83 rq:546424 version:8.15.2 Changes: -------- --- /work/SRC/openSUSE:Factory/sendmail/sendmail.changes 2017-11-25 08:43:15.972930298 +0100 +++ /work/SRC/openSUSE:Factory/.sendmail.new/sendmail.changes 2017-11-30 12:45:57.420685039 +0100 @@ -1,0 +2,6 @@ +Wed Nov 29 10:55:02 UTC 2017 - werner(a)suse.de + +- Add _FFR_TLS_EC m4 macro definition for site configuration as + well (boo#1070065) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sendmail-8.15.2-openssl-1.1.0-fix.patch ++++++ --- /var/tmp/diff_new_pack.tquu55/_old 2017-11-30 12:45:59.868596051 +0100 +++ /var/tmp/diff_new_pack.tquu55/_new 2017-11-30 12:45:59.868596051 +0100 @@ -1,5 +1,9 @@ ---- sendmail-8.15.2.orig/sendmail/tls.c 2016-12-01 15:20:59.953546417 +0100 -+++ sendmail-8.15.2.orig/sendmail/tls.c 2016-12-01 17:26:43.868521378 +0100 +--- + sendmail-8.15.2/sendmail/tls.c | 109 +++++++++++++++++++++++++++++++++++------ + 1 file changed, 95 insertions(+), 14 deletions(-) + +--- sendmail-8.15.2/sendmail/tls.c ++++ sendmail-8.15.2/sendmail/tls.c 2017-11-29 08:52:15.305299693 +0000 @@ -63,14 +63,28 @@ static unsigned char dh512_g[] = static DH * get_dh512() @@ -150,7 +154,7 @@ dh = DSA_dup_DH(dsa); DSA_free(dsa); } -@@ -1747,7 +1819,7 @@ tmp_rsa_key(s, export, keylength) +@@ -1744,7 +1816,7 @@ tmp_rsa_key(s, export, keylength) if (rsa_tmp != NULL) RSA_free(rsa_tmp); @@ -159,7 +163,7 @@ if (rsa_tmp == NULL) { if (LogLevel > 0) -@@ -1974,11 +2046,20 @@ x509_verify_cb(ok, ctx) +@@ -1971,11 +2043,20 @@ x509_verify_cb(ok, ctx) { if (LogLevel > 13) tls_verify_log(ok, ctx, "x509"); ++++++ sendmail-8.15.2.dif ++++++ --- /var/tmp/diff_new_pack.tquu55/_old 2017-11-30 12:45:59.884595469 +0100 +++ /var/tmp/diff_new_pack.tquu55/_new 2017-11-30 12:45:59.884595469 +0100 @@ -31,9 +31,9 @@ doc/op/op.me | 52 +++++++++++++++++++------------------- include/sm/conf.h | 48 +++++++++++++++++++++++++++-------- libmilter/Makefile.m4 | 28 ++++++++++++++++++++ - libsm/Makefile.m4 | 3 ++ + libsm/Makefile.m4 | 4 ++ libsm/inet6_ntop.c | 2 - - libsmutil/Makefile.m4 | 3 ++ + libsmutil/Makefile.m4 | 4 ++ mail.local/Makefile.m4 | 6 +++- mail.local/mail.local.8 | 4 +- mailstats/mailstats.8 | 5 ++- @@ -50,10 +50,10 @@ smrsh/README | 32 +++++++++++------------ smrsh/smrsh.8 | 25 ++++++++---------- vacation/vacation.c | 3 ++ - 51 files changed, 287 insertions(+), 139 deletions(-) + 51 files changed, 289 insertions(+), 139 deletions(-) --- cf/README -+++ cf/README 2017-03-22 18:07:23.194336265 +0000 ++++ cf/README 2017-11-29 08:53:04.280369594 +0000 @@ -364,7 +364,7 @@ LOCAL_MAILER_DSN_DIAGNOSTIC_CODE local mailer. This should be changed with care. LOCAL_SHELL_PATH [/bin/sh] The shell used to deliver piped email. @@ -64,7 +64,7 @@ mail. LOCAL_SHELL_DIR [$z:/] The directory search path in which the --- cf/domain/generic.m4 -+++ cf/domain/generic.m4 2017-03-22 18:07:23.194336265 +0000 ++++ cf/domain/generic.m4 2017-11-29 08:53:04.280369594 +0000 @@ -25,4 +25,4 @@ define(`confFORWARD_PATH', `$z/.forward. define(`confMAX_HEADERS_LENGTH', `32768')dnl FEATURE(`redirect')dnl @@ -72,7 +72,7 @@ -EXPOSED_USER(`root') +ifdef(`_MAILER_uucp_', `EXPOSED_USER(`root uucp')',`EXPOSED_USER(`root')')dnl --- cf/feature/masquerade_envelope.m4 -+++ cf/feature/masquerade_envelope.m4 2017-03-22 18:07:23.194336265 +0000 ++++ cf/feature/masquerade_envelope.m4 2017-11-29 08:53:04.284369517 +0000 @@ -17,3 +17,5 @@ VERSIONID(`$Id: masquerade_envelope.m4,v divert(-1) @@ -80,7 +80,7 @@ + +divert(0)dnl --- cf/feature/msp.m4 -+++ cf/feature/msp.m4 2017-03-22 18:07:23.194336265 +0000 ++++ cf/feature/msp.m4 2017-11-29 08:53:04.284369517 +0000 @@ -20,7 +20,7 @@ define(`confPRIVACY_FLAGS', `goaway,noet define(`confDONT_PROBE_INTERFACES', `True') dnl --------------------------------------------- @@ -110,7 +110,7 @@ LOCAL_RULESETS SLocal_localaddr --- cf/feature/use_cw_file.m4 -+++ cf/feature/use_cw_file.m4 2017-03-22 18:07:23.198336192 +0000 ++++ cf/feature/use_cw_file.m4 2017-11-29 08:53:04.284369517 +0000 @@ -22,4 +22,4 @@ divert(-1) define(`USE_CW_FILE', `') @@ -118,7 +118,7 @@ -divert(0) +divert(0)dnl --- cf/m4/cfhead.m4 -+++ cf/m4/cfhead.m4 2017-03-22 18:07:23.198336192 +0000 ++++ cf/m4/cfhead.m4 2017-11-29 08:53:04.284369517 +0000 @@ -304,6 +304,7 @@ define(`confMILTER_MACROS_HELO', ``{tls_ define(`confMILTER_MACROS_ENVFROM', ``i, {auth_type}, {auth_authen}, {auth_ssf}, {auth_author}, {mail_mailer}, {mail_host}, {mail_addr}'') define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'') @@ -128,7 +128,7 @@ divert(0)dnl --- cf/m4/proto.m4 -+++ cf/m4/proto.m4 2017-03-22 18:07:23.198336192 +0000 ++++ cf/m4/proto.m4 2017-11-29 08:53:04.284369517 +0000 @@ -1279,6 +1279,12 @@ ifdef(`_PRESERVE_LUSER_HOST_', `dnl R< $+ > $+ $: < $1 > $2 $&{Host}') dnl') @@ -143,7 +143,7 @@ R< > $+ $: < $H > $1 try hub', `dnl') ifdef(`LOCAL_RELAY', `dnl --- cf/mailer/cyrus.m4 -+++ cf/mailer/cyrus.m4 2017-03-22 18:07:23.198336192 +0000 ++++ cf/mailer/cyrus.m4 2017-11-29 08:53:04.284369517 +0000 @@ -36,7 +36,7 @@ PUSHDIVERT(-1) # @@ -162,7 +162,7 @@ ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')U=CYRUS_MAILER_USER, T=DNS/RFC822/X-Unix,_CYRUS_QGRP A=CYRUS_MAILER_ARGS --- cf/mailer/fax.m4 -+++ cf/mailer/fax.m4 2017-03-22 18:07:23.198336192 +0000 ++++ cf/mailer/fax.m4 2017-11-29 08:53:04.284369517 +0000 @@ -30,6 +30,7 @@ POPDIVERT VERSIONID(`$Id: fax.m4,v 8.17 2013-11-22 20:51:14 ca Exp $') @@ -172,7 +172,7 @@ M=FAX_MAILER_MAX, T=X-Phone/X-FAX/X-Unix,_FAX_QGRP A=FAX_MAILER_ARGS --- cf/mailer/local.m4 -+++ cf/mailer/local.m4 2017-03-22 18:07:23.198336192 +0000 ++++ cf/mailer/local.m4 2017-11-29 08:53:04.284369517 +0000 @@ -34,6 +34,7 @@ POPDIVERT VERSIONID(`$Id: local.m4,v 8.60 2013-11-22 20:51:14 ca Exp $') @@ -190,7 +190,7 @@ _OPTINS(`LOCAL_MAILER_MAX', `M=', `, ')_OPTINS(`LOCAL_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`LOCAL_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`LOCAL_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/LOCAL_MAILER_DSN_DIAGNOSTIC_CODE,_LOCAL_QGRP A=LOCAL_MAILER_ARGS --- cf/mailer/mail11.m4 -+++ cf/mailer/mail11.m4 2017-03-22 18:07:23.198336192 +0000 ++++ cf/mailer/mail11.m4 2017-11-29 08:53:04.284369517 +0000 @@ -34,7 +34,7 @@ R$* < @ $=w .DECNET. > $#_LOCAL_ $: $1 R$+ < @ $+ .DECNET. > $#mail11 $@ $2 $: $1 DECnet user POPDIVERT @@ -220,7 +220,7 @@ + T=DNS/X-DECnet/X-Unix,_MAIL11_QGRP + A=MAIL11_MAILER_ARGS --- cf/mailer/phquery.m4 -+++ cf/mailer/phquery.m4 2017-03-22 18:07:23.198336192 +0000 ++++ cf/mailer/phquery.m4 2017-11-29 08:53:04.284369517 +0000 @@ -27,6 +27,7 @@ POPDIVERT VERSIONID(`$Id: phquery.m4,v 8.18 2013-11-22 20:51:14 ca Exp $') @@ -230,7 +230,7 @@ T=DNS/RFC822/X-Unix,_PH_QGRP A=PH_MAILER_ARGS --- cf/mailer/pop.m4 -+++ cf/mailer/pop.m4 2017-03-22 18:07:23.198336192 +0000 ++++ cf/mailer/pop.m4 2017-11-29 08:53:04.284369517 +0000 @@ -25,6 +25,7 @@ POPDIVERT VERSIONID(`$Id: pop.m4,v 8.23 2013-11-22 20:51:14 ca Exp $') @@ -240,7 +240,7 @@ T=DNS/RFC822/X-Unix,_POP_QGRP A=POP_MAILER_ARGS --- cf/mailer/procmail.m4 -+++ cf/mailer/procmail.m4 2017-03-22 18:07:23.198336192 +0000 ++++ cf/mailer/procmail.m4 2017-11-29 08:53:04.284369517 +0000 @@ -29,6 +29,7 @@ POPDIVERT VERSIONID(`$Id: procmail.m4,v 8.23 2013-11-22 20:51:14 ca Exp $') @@ -250,7 +250,7 @@ ifdef(`PROCMAIL_MAILER_MAX', `M=PROCMAIL_MAILER_MAX, ')T=DNS/RFC822/X-Unix,_PROCMAIL_QGRP A=PROCMAIL_MAILER_ARGS --- cf/mailer/qpage.m4 -+++ cf/mailer/qpage.m4 2017-03-22 18:07:23.242335370 +0000 ++++ cf/mailer/qpage.m4 2017-11-29 08:53:04.300369213 +0000 @@ -26,6 +26,7 @@ POPDIVERT VERSIONID(`$Id: qpage.m4,v 8.11 2013-11-22 20:51:14 ca Exp $') @@ -260,7 +260,7 @@ M=QPAGE_MAILER_MAX, T=DNS/RFC822/X-Unix,_QPAGE_QGRP A=QPAGE_MAILER_ARGS --- cf/mailer/smtp.m4 -+++ cf/mailer/smtp.m4 2017-03-22 18:07:23.242335370 +0000 ++++ cf/mailer/smtp.m4 2017-11-29 08:53:04.300369213 +0000 @@ -33,6 +33,7 @@ POPDIVERT VERSIONID(`$Id: smtp.m4,v 8.66 2013-11-22 20:51:14 ca Exp $') @@ -278,7 +278,7 @@ _OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,_SMTP_QGRP A=SMTP_MAILER_ARGS --- cf/mailer/usenet.m4 -+++ cf/mailer/usenet.m4 2017-03-22 18:07:23.242335370 +0000 ++++ cf/mailer/usenet.m4 2017-11-29 08:53:04.300369213 +0000 @@ -23,6 +23,7 @@ POPDIVERT VERSIONID(`$Id: usenet.m4,v 8.23 2013-11-22 20:51:14 ca Exp $') @@ -288,7 +288,7 @@ _OPTINS(`USENET_MAILER_MAX', `M=', `, ')T=X-Usenet/X-Usenet/X-Unix,_USENET_QGRP A=USENET_MAILER_ARGS $u --- cf/mailer/uucp.m4 -+++ cf/mailer/uucp.m4 2017-03-22 18:07:23.242335370 +0000 ++++ cf/mailer/uucp.m4 2017-11-29 08:53:04.300369213 +0000 @@ -26,6 +26,7 @@ POPDIVERT VERSIONID(`$Id: uucp.m4,v 8.45 2013-11-22 20:51:14 ca Exp $') @@ -311,7 +311,7 @@ - --- cf/sh/makeinfo.sh -+++ cf/sh/makeinfo.sh 2017-03-22 18:07:23.242335370 +0000 ++++ cf/sh/makeinfo.sh 2017-11-29 08:53:04.304369138 +0000 @@ -22,7 +22,7 @@ do then p="." @@ -353,7 +353,7 @@ echo '#####' using $1 as configuration include directory | sed 's/\/tmp_mnt//' echo "define(\`__HOST__', $host)dnl" --- contrib/bounce-resender.pl -+++ contrib/bounce-resender.pl 2017-03-22 18:07:23.242335370 +0000 ++++ contrib/bounce-resender.pl 2017-11-29 08:53:04.304369138 +0000 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl -w @@ -370,7 +370,7 @@ # FIXME: Define the functions "major" and "minor" for your OS. --- contrib/doublebounce.pl -+++ contrib/doublebounce.pl 2017-03-22 18:07:23.242335370 +0000 ++++ contrib/doublebounce.pl 2017-11-29 08:53:04.304369138 +0000 @@ -111,6 +111,11 @@ EOT return $result; } @@ -400,7 +400,7 @@ exit(0); - --- contrib/etrn.pl -+++ contrib/etrn.pl 2017-03-22 18:07:23.242335370 +0000 ++++ contrib/etrn.pl 2017-11-29 08:53:04.304369138 +0000 @@ -1,4 +1,4 @@ -#!/usr/perl5/bin/perl -w +#!/usr/bin/perl -w @@ -408,7 +408,7 @@ # CDDL HEADER START # --- contrib/expn.pl -+++ contrib/expn.pl 2017-03-22 18:07:23.242335370 +0000 ++++ contrib/expn.pl 2017-11-29 08:53:04.304369138 +0000 @@ -101,6 +101,7 @@ use Fcntl; $have_nslookup = 1; # we have the nslookup program @@ -483,7 +483,7 @@ .BR nslookup . .SH SEE ALSO --- contrib/passwd-to-alias.pl -+++ contrib/passwd-to-alias.pl 2017-03-22 18:07:23.246335294 +0000 ++++ contrib/passwd-to-alias.pl 2017-11-29 08:53:04.304369138 +0000 @@ -1,4 +1,4 @@ -#!/bin/perl +#!/usr/bin/perl @@ -491,7 +491,7 @@ # # Convert GECOS information in password files to alias syntax. --- contrib/smcontrol.pl -+++ contrib/smcontrol.pl 2017-03-22 18:07:23.246335294 +0000 ++++ contrib/smcontrol.pl 2017-11-29 08:53:04.304369138 +0000 @@ -25,7 +25,7 @@ sub get_controlname my $cn = undef; my $qd = undef; @@ -502,7 +502,7 @@ { chomp; --- devtools/M4/UNIX/manpage.m4 -+++ devtools/M4/UNIX/manpage.m4 2017-03-22 18:07:23.246335294 +0000 ++++ devtools/M4/UNIX/manpage.m4 2017-11-29 08:53:04.304369138 +0000 @@ -69,7 +69,7 @@ ifdef(`confNO_MAN_INSTALL', `divert(-1)' define(`bldMAN_INSTALL_CMD', `ifdef(`confDONT_INSTALL_CATMAN', `dnl', @@ -513,7 +513,7 @@ ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ') ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')' --- devtools/M4/depend/CC-M.m4 -+++ devtools/M4/depend/CC-M.m4 2017-03-22 18:07:23.246335294 +0000 ++++ devtools/M4/depend/CC-M.m4 2017-11-29 08:53:04.304369138 +0000 @@ -3,6 +3,6 @@ depend: ${BEFORE} ${LINKS} @mv Makefile Makefile.old @sed -e '/^# Do not edit or remove this line or anything below it.$$/,$$d' < Makefile.old > Makefile @@ -523,7 +523,7 @@ # End of $RCSfile: CC-M.m4,v $ --- devtools/OS/Linux -+++ devtools/OS/Linux 2017-03-22 18:07:23.254335146 +0000 ++++ devtools/OS/Linux 2017-11-29 08:53:04.304369138 +0000 @@ -5,8 +5,9 @@ dnl Place personal settings in devtools/ define(`confDEPEND_TYPE', `CC-M') @@ -536,7 +536,7 @@ define(`confEBINDIR', `/usr/sbin') APPENDDEF(`confLIBSEARCH', `crypt nsl') --- devtools/bin/install.sh -+++ devtools/bin/install.sh 2017-03-22 18:07:23.246335294 +0000 ++++ devtools/bin/install.sh 2017-11-29 08:53:04.304369138 +0000 @@ -16,6 +16,7 @@ owner="" group="" mode="" @@ -564,7 +564,7 @@ chgrp $group $dst if [ $? != 0 ] --- doc/op/op.me -+++ doc/op/op.me 2017-03-22 18:07:23.246335294 +0000 ++++ doc/op/op.me 2017-11-29 08:53:04.308369061 +0000 @@ -588,7 +588,7 @@ The binary for .i sendmail is located in /usr/\*(SD\**. @@ -800,7 +800,7 @@ nothing can replace looking at what your own system generates. .)f --- include/sm/conf.h -+++ include/sm/conf.h 2017-03-22 18:07:23.250335221 +0000 ++++ include/sm/conf.h 2017-11-29 08:53:04.308369061 +0000 @@ -1460,23 +1460,47 @@ extern void *malloc(); # define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) # endif /* !defined(KERNEL_VERSION) */ @@ -911,7 +911,7 @@ # ifndef HASFCHOWN # define HASFCHOWN 1 /* fchown(2) */ --- libmilter/Makefile.m4 -+++ libmilter/Makefile.m4 2017-03-23 08:51:06.231522895 +0000 ++++ libmilter/Makefile.m4 2017-11-29 08:53:04.308369061 +0000 @@ -12,6 +12,8 @@ PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} bldPRODUCT_START(`library', `libmilter') define(`bldINSTALLABLE', `true') @@ -955,8 +955,8 @@ MFAPI= ${SRCDIR}/inc`'lude/libmilter/mfapi.h MFDEF= ${SRCDIR}/inc`'lude/libmilter/mfdef.h --- libsm/Makefile.m4 -+++ libsm/Makefile.m4 2017-03-22 18:07:23.250335221 +0000 -@@ -4,8 +4,11 @@ include(confBUILDTOOLSDIR`/M4/switch.m4' ++++ libsm/Makefile.m4 2017-11-29 10:48:15.568980450 +0000 +@@ -4,8 +4,12 @@ include(confBUILDTOOLSDIR`/M4/switch.m4' define(`confREQUIRE_LIBSM', `true') define(`confREQUIRE_SM_OS_H', `true') @@ -964,12 +964,13 @@ +APPENDDEF(`confCCOPTS', `-fPIC') PREPENDDEF(`confENVDEF', `confMAPDEF') bldPRODUCT_START(`library', `libsm') ++define(`bldINSTALL_DIR', `') +define(`bldINSTALLABLE', `true') define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c inet6_ntop.c ') bldPRODUCT_END dnl msg.c --- libsm/inet6_ntop.c -+++ libsm/inet6_ntop.c 2017-03-22 18:07:23.254335146 +0000 ++++ libsm/inet6_ntop.c 2017-11-29 08:53:04.308369061 +0000 @@ -11,8 +11,8 @@ #include <sm/gen.h> SM_RCSID("@(#)$Id: inet6_ntop.c,v 1.2 2013-11-22 20:51:43 ca Exp $") @@ -981,8 +982,8 @@ # include <sm/io.h> # include <sm/string.h> --- libsmutil/Makefile.m4 -+++ libsmutil/Makefile.m4 2017-03-22 18:07:23.250335221 +0000 -@@ -6,8 +6,11 @@ define(`confREQUIRE_SM_OS_H', `true') ++++ libsmutil/Makefile.m4 2017-11-29 10:48:50.672312342 +0000 +@@ -6,8 +6,12 @@ define(`confREQUIRE_SM_OS_H', `true') SMSRCDIR= ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail') PREPENDDEF(`confENVDEF', `confMAPDEF') PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ') @@ -990,12 +991,13 @@ +APPENDDEF(`confCCOPTS', `-fPIC') bldPRODUCT_START(`library', `libsmutil') ++define(`bldINSTALL_DIR', `') +define(`bldINSTALLABLE', `true') define(`bldSOURCES', `debug.c err.c lockfile.c safefile.c snprintf.c cf.c ') APPENDDEF(`confENVDEF', `-DNOT_SENDMAIL') bldPRODUCT_END --- mail.local/Makefile.m4 -+++ mail.local/Makefile.m4 2017-03-22 18:07:23.250335221 +0000 ++++ mail.local/Makefile.m4 2017-11-29 08:53:04.308369061 +0000 @@ -20,8 +20,12 @@ bldPRODUCT_START(`manpage', `mail.local' define(`bldSOURCES', `mail.local.8') bldPRODUCT_END @@ -1011,7 +1013,7 @@ @echo " systems such as HP-UX and Solaris. Please consult the" @echo " README file in the mail.local directory. You can force" --- mail.local/mail.local.8 -+++ mail.local/mail.local.8 2017-03-22 18:07:23.250335221 +0000 ++++ mail.local/mail.local.8 2017-11-29 08:53:04.308369061 +0000 @@ -123,10 +123,10 @@ Used to set the appropriate time zone on /tmp/local.XXXXXX temporary files @@ -1026,7 +1028,7 @@ .PD .SH SEE ALSO --- mailstats/mailstats.8 -+++ mailstats/mailstats.8 2017-03-22 18:07:23.250335221 +0000 ++++ mailstats/mailstats.8 2017-11-29 08:53:04.308369061 +0000 @@ -108,10 +108,13 @@ The default .B sendmail configuration file. @@ -1043,7 +1045,7 @@ .SH SEE ALSO mailq(1), --- makemap/makemap.8 -+++ makemap/makemap.8 2017-03-22 18:07:23.250335221 +0000 ++++ makemap/makemap.8 2017-11-29 08:53:04.308369061 +0000 @@ -44,20 +44,13 @@ It reads input from the standard input and outputs them to the indicated .I mapname. @@ -1067,7 +1069,7 @@ B-Tree format maps. This requires the new Berkeley DB --- praliases/Makefile.m4 -+++ praliases/Makefile.m4 2017-03-22 18:07:23.250335221 +0000 ++++ praliases/Makefile.m4 2017-11-29 08:53:04.308369061 +0000 @@ -9,7 +9,8 @@ PREPENDDEF(`confENVDEF', `confMAPDEF') PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ') @@ -1079,7 +1081,7 @@ bldPUSH_SMLIB(`sm') bldPUSH_SMLIB(`smutil') --- rmail/rmail.c -+++ rmail/rmail.c 2017-03-22 18:07:23.250335221 +0000 ++++ rmail/rmail.c 2017-11-29 08:53:04.308369061 +0000 @@ -276,7 +276,7 @@ main(argc, argv) args[i++] = _PATH_SENDMAIL; /* Build sendmail's argument list. */ args[i++] = "-G"; /* relay submission */ @@ -1090,7 +1092,7 @@ /* set from system and protocol used */ --- sendmail/Makefile.m4 -+++ sendmail/Makefile.m4 2017-03-22 18:07:23.250335221 +0000 ++++ sendmail/Makefile.m4 2017-11-29 08:53:04.308369061 +0000 @@ -49,13 +49,16 @@ ${DESTDIR}/etc/mail/submit.cf: cd ${SRCDIR}/cf/cf && make install-submit-cf @@ -1109,7 +1111,7 @@ chmod 0770 ${DESTDIR}${MSPQ} --- sendmail/SECURITY -+++ sendmail/SECURITY 2017-03-22 18:07:23.250335221 +0000 ++++ sendmail/SECURITY 2017-11-29 08:53:04.308369061 +0000 @@ -49,14 +49,14 @@ The default configuration starting with sendmail binary which acts differently based on operation mode and supplied options. @@ -1206,7 +1208,7 @@ STARTTLS: If sendmail is compiled with STARTTLS support on a platform that does not have HASURANDOMDEV defined, you either need to specify --- sendmail/control.c -+++ sendmail/control.c 2017-03-22 18:07:23.250335221 +0000 ++++ sendmail/control.c 2017-11-29 08:53:04.308369061 +0000 @@ -137,7 +137,7 @@ opencontrolsocket() } } @@ -1217,7 +1219,7 @@ save_errno = errno; closecontrolsocket(true); --- sendmail/domain.c -+++ sendmail/domain.c 2017-03-22 18:07:23.250335221 +0000 ++++ sendmail/domain.c 2017-11-29 08:53:04.308369061 +0000 @@ -870,14 +870,20 @@ cnameloop: if (qtype == initial) gotmx = false; @@ -1242,7 +1244,7 @@ ret = res_querydomain(host, *dp, C_IN, qtype, answer.qb2, sizeof(answer.qb2)); --- sendmail/readcf.c -+++ sendmail/readcf.c 2017-03-22 18:07:23.254335146 +0000 ++++ sendmail/readcf.c 2017-11-29 08:53:04.308369061 +0000 @@ -1751,15 +1751,20 @@ makemailer(line) #endif /* NETUNIX */ ) @@ -1267,7 +1269,7 @@ if (m->m_mtatype == NULL) m->m_mtatype = "dns"; --- sendmail/sendmail.h -+++ sendmail/sendmail.h 2017-03-22 18:07:23.254335146 +0000 ++++ sendmail/sendmail.h 2017-11-29 08:53:04.312368985 +0000 @@ -154,14 +154,14 @@ typedef int (*sasl_callback_ft)(void); # define SASL SASL_VERSION # else /* SASL == 1 || SASL == 2 */ @@ -1288,7 +1290,7 @@ # endif /* defined(SASL_VERSION_MAJOR) && defined(SASL_VERSION_MINOR) && defined(SASL_VERSION_STEP) */ #endif /* SASL */ --- sendmail/udb.c -+++ sendmail/udb.c 2017-03-22 18:07:23.254335146 +0000 ++++ sendmail/udb.c 2017-11-29 08:53:04.312368985 +0000 @@ -1040,24 +1040,29 @@ _udbx_init(e) # if DB_VERSION_MAJOR < 2 @@ -1336,7 +1338,7 @@ up->udb_type = UDB_DBFETCH; up->udb_pid = CurrentPid; --- smrsh/README -+++ smrsh/README 2017-03-22 18:07:23.254335146 +0000 ++++ smrsh/README 2017-11-29 08:53:04.312368985 +0000 @@ -6,7 +6,7 @@ Software Engineering Institute, Carnegie intended as a supplement to the CERT advisory CA-93:16.sendmail.vulnerability, and to the software, smrsh.c, written by Eric Allman. @@ -1439,7 +1441,7 @@ After modifying the Mprog definition in the sendmail.cf file, if a frozen --- smrsh/smrsh.8 -+++ smrsh/smrsh.8 2017-03-22 18:07:23.254335146 +0000 ++++ smrsh/smrsh.8 2017-11-29 08:53:04.312368985 +0000 @@ -39,7 +39,7 @@ Briefly, .I smrsh limits programs to be in a single directory, @@ -1505,7 +1507,7 @@ .SH SEE ALSO sendmail(8) --- vacation/vacation.c -+++ vacation/vacation.c 2017-03-22 18:07:23.254335146 +0000 ++++ vacation/vacation.c 2017-11-29 08:53:04.312368985 +0000 @@ -699,6 +699,7 @@ junkmail(from) { "uucp", 4 }, { "mailer-daemon", 13 }, ++++++ sendmail-suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/cf/feature/dialup.m4 new/sendmail-suse/cf/feature/dialup.m4 --- old/sendmail-suse/cf/feature/dialup.m4 2006-08-10 11:32:28.000000000 +0200 +++ new/sendmail-suse/cf/feature/dialup.m4 2017-11-29 11:10:42.059833246 +0100 @@ -10,7 +10,7 @@ # divert(0) -VERSIONID(`(a)(#)dialup.m4 0.2 (SuSE Linux) 2003/04/15') +VERSIONID(`(a)(#)dialup.m4 0.2 (SUSE Linux) 2003/04/15') divert(-1) ifdef(`_MAILER_smtp_', `errprint(`*** MAILER(smtp) must appear after HACK(dialup)' )')dnl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/cf/feature/expensive.m4 new/sendmail-suse/cf/feature/expensive.m4 --- old/sendmail-suse/cf/feature/expensive.m4 2006-08-10 11:32:28.000000000 +0200 +++ new/sendmail-suse/cf/feature/expensive.m4 2017-11-29 11:10:42.059833246 +0100 @@ -9,7 +9,7 @@ # divert(0) -VERSIONID(`(a)(#)expensive.m4 0.3 (SuSE Linux) 2006/06/20') +VERSIONID(`(a)(#)expensive.m4 0.3 (SUSE Linux) 2006/06/20') divert(-1) ifdef(`_MAILER_smtp_', `errprint(`*** MAILER(smtp) must appear after FEATURE(expensive)' )')dnl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/cf/feature/ldap.m4 new/sendmail-suse/cf/feature/ldap.m4 --- old/sendmail-suse/cf/feature/ldap.m4 2006-08-10 11:32:28.000000000 +0200 +++ new/sendmail-suse/cf/feature/ldap.m4 2017-11-29 11:10:42.059833246 +0100 @@ -13,7 +13,7 @@ # divert(0) -VERSIONID(`(a)(#)ldap.m4 0.2 (SuSE Linux) 2000/03/22') +VERSIONID(`(a)(#)ldap.m4 0.2 (SUSE Linux) 2000/03/22') divert(-1) ifelse(_ARGS_,`',`errprint(`FEATURE(ldap) requires argument! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/cf/feature/no_local_masquerading.m4 new/sendmail-suse/cf/feature/no_local_masquerading.m4 --- old/sendmail-suse/cf/feature/no_local_masquerading.m4 2006-08-10 11:32:28.000000000 +0200 +++ new/sendmail-suse/cf/feature/no_local_masquerading.m4 2017-11-29 11:10:42.059833246 +0100 @@ -9,7 +9,7 @@ # divert(0) -VERSIONID(`(a)(#)no_local_masquerading.m4 0.1 (SuSE Linux) 2000/03/21') +VERSIONID(`(a)(#)no_local_masquerading.m4 0.1 (SUSE Linux) 2000/03/21') divert(-1) ifdef(`_MAILER_local_', `errprint(`*** MAILER(local) must appear after FEATURE(no_local_masquerading)' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/cf/hack/nodns.m4 new/sendmail-suse/cf/hack/nodns.m4 --- old/sendmail-suse/cf/hack/nodns.m4 2006-08-10 11:32:28.000000000 +0200 +++ new/sendmail-suse/cf/hack/nodns.m4 2017-11-29 11:10:42.059833246 +0100 @@ -7,7 +7,7 @@ # divert(0) -VERSIONID(`(a)(#)nodns.m4 0.3 (SuSE Linux) 2006/19/06') +VERSIONID(`(a)(#)nodns.m4 0.3 (SUSE Linux) 2006/19/06') divert(-1) dnl dnl We can not resolve unqualified senders or domains diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/cf/mailer/fido.m4 new/sendmail-suse/cf/mailer/fido.m4 --- old/sendmail-suse/cf/mailer/fido.m4 2006-08-10 11:32:28.000000000 +0200 +++ new/sendmail-suse/cf/mailer/fido.m4 2017-11-29 11:10:42.059833246 +0100 @@ -16,7 +16,7 @@ ### FIDO Mailer specification ### ################################# -VERSIONID(`@(#) fido.m4 8.10.0-0.2 (SuSE Linux) 23/03/2000') +VERSIONID(`@(#) fido.m4 8.10.0-0.2 (SUSE Linux) 23/03/2000') MAILER_DEFINITIONS Mfido, P=FIDO_MAILER_PATH, F=_MODMF_(CONCAT(_DEF_FIDO_MAILER_FLAGS, FIDO_MAILER_FLAGS), `FIDO'), S=EnvFromUD/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/cf/mailer/mail500.m4 new/sendmail-suse/cf/mailer/mail500.m4 --- old/sendmail-suse/cf/mailer/mail500.m4 2006-08-10 11:32:28.000000000 +0200 +++ new/sendmail-suse/cf/mailer/mail500.m4 2017-11-29 11:10:42.059833246 +0100 @@ -42,7 +42,7 @@ ### MAIL500 Mailer specification ### ######################################## -VERSIONID(`@(#) mail500.m4 0.1 (SuSE Linux) 2000/03/22') +VERSIONID(`@(#) mail500.m4 0.1 (SUSE Linux) 2000/03/22') MAILER_DEFINITIONS Mmail500, P=MAIL500_MAILER_PATH, F=_MODMF_(CONCAT(_DEF_MAIL500_MAILER_FLAGS, MAIL500_MAILER_FLAGS), `MAIL500'), S=EnvFromSMTP/HdrFromSMTP, R=EnvToL/HdrToL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/cf/ostype/suse-linux.m4 new/sendmail-suse/cf/ostype/suse-linux.m4 --- old/sendmail-suse/cf/ostype/suse-linux.m4 2006-08-10 11:32:28.000000000 +0200 +++ new/sendmail-suse/cf/ostype/suse-linux.m4 2017-11-29 11:26:08.586218810 +0100 @@ -7,8 +7,8 @@ # divert(0) -VERSIONID(`@(#) suse-linux.m4 0.8 (SuSE Linux) 2005/11/11') -define(`confCF_VERSION', `SuSE Linux 0.8')dnl +VERSIONID(`@(#) suse-linux.m4 0.9 (SUSE Linux) 2017/11/29') +define(`confCF_VERSION', `SUSE Linux 0.8')dnl dnl dnl Flags dnl @@ -29,6 +29,8 @@ define(`confNO_RCPT_ACTION', `add-to-undisclosed')dnl dnl Note: RFC1891 says that, but often misused dnl define(`confRRT_IMPLIES_DSN', `True')dnl +dnl Enable _FFR_MAIL_MACRO already enabeld in the site compile options +define(`_FFR_MAIL_MACRO', `1') FEATURE(`always_add_domain')dnl dnl dnl Mailer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/devtools/Site/site.config.m4 new/sendmail-suse/devtools/Site/site.config.m4 --- old/sendmail-suse/devtools/Site/site.config.m4 2017-03-23 10:00:47.044631141 +0100 +++ new/sendmail-suse/devtools/Site/site.config.m4 2017-11-29 11:59:59.559581162 +0100 @@ -1,5 +1,5 @@ dnl -dnl Sendmail site file for SuSE Linux +dnl Sendmail site file for SUSE Linux dnl Author: Werner Fink <werner(a)suse.de> dnl dnl Short cuts @@ -82,6 +82,7 @@ appdef(`confENVDEF', `-D_PATH_SENDMAILCF=\"'confVENDORCF`\"')dnl appdef(`confENVDEF', `-D_PATH_VENDOR_CF=\"'confVENDORCF`\"')dnl appdef(`confENVDEF', `-D_PATH_SENDMAIL=\"'confSBINDIR`/sendmail\"')dnl +appdef(`confENVDEF', `-D_FFR_LINUX_MHNL')dnl dnl dnl Various maps dnl @@ -98,11 +99,19 @@ ifelse(SMLDAP, `-lssl -lcrypto -lsasl2', `', dnl `appdef(`conf_sendmail_ENVDEF', `-DLDAP_REFERRALS')')dnl appdef(`conf_sendmail_ENVDEF', `-DTCPWRAPPERS=1')dnl +appdef(`conf_sendmail_ENVDEF', `-DHASGETUSERSHELL=1')dnl +appdef(`conf_sendmail_ENVDEF', `-DMAXDAEMONS=64')dnl appdef(`conf_sendmail_ENVDEF', `-DXDEBUG=0')dnl +appdef(`conf_sendmail_ENVDEF', `-D_FFR_BADRCPT_SHUTDOWN')dnl +appdef(`conf_sendmail_ENVDEF', `-D_FFR_MAIL_MACRO')dnl +appdef(`conf_sendmail_ENVDEF', `-D_FFR_NO_PIPE')dnl +appdef(`conf_sendmail_ENVDEF', `-D_FFR_RHS')dnl +appdef(`conf_sendmail_ENVDEF', `-D_FFR_SKIP_DOMAINS')dnl dnl appdef(`conf_sendmail_ENVDEF', `-DPICKY_HELO_CHECK')dnl appdef(`conf_sendmail_ENVDEF', `-D_PATH_SENDMAILPID=\"/var/run/sendmail.pid\"')dnl appdef(`conf_sendmail_ENVDEF', `-DSTARTTLS -DEGD -DSASL=2')dnl -appdef(`conf_sendmail_ENVDEF', `-D_FFR_TLS_1')dnl +appdef(`conf_sendmail_ENVDEF', `-D_FFR_TLS_EC')dnl +appdef(`conf_sendmail_ENVDEF', `-D_FFR_TLS_SE_OPTS')dnl appdef(`conf_sendmail_ENVDEF', `-DSM_CONF_SHM')dnl appdef(`conf_sendmail_LIB_POST', SMDB)dnl appdef(`conf_sendmail_LIB_POST', `-lnsl -lresolv 'SMLDAP` -lwrap')dnl Binary files old/sendmail-suse/suse/.Makefile.swp and new/sendmail-suse/suse/.Makefile.swp differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/suse/README new/sendmail-suse/suse/README --- old/sendmail-suse/suse/README 2006-08-10 11:32:29.000000000 +0200 +++ new/sendmail-suse/suse/README 2017-11-29 11:16:53.496772916 +0100 @@ -8,14 +8,14 @@ simple sendmail configurations: =============================== -sendmail is the default mail transfer agent (MTA) for SuSE Linux. +sendmail was the default mail transfer agent (MTA) for SUSE Linux. It decides what to do with email: transfer it over the network, store it on the local disk or hand it over to other transfer- programs like UUCP. /etc/sendmail.cf is the main sendmail configuration file. If you have a simple setup, you can edit /etc/sysconfig/sendmail and -run /sbin/SuSEconfig to have a working /etc/sendmail.cf. +run /usr/lib/sendmail.d/update to have a working /etc/sendmail.cf. Before setting up sendmail, you should make sure that the DNS (domain name system) data is correctly configured. DNS maps hostnames to IP-adresses. @@ -149,8 +149,8 @@ configuration uses /etc/aliases, /etc/mail/mailertable, /etc/mail/genericstable and /etc/mail/virtusertable. These files are normal text files that are converted with "makemap" -to the real database files (ending in .db). /sbin/SuSEconfig will -automatically call "makemap" if you have changed one of these files.) +to the real database files (ending in .db). /usr/lib/sendmail.d/update +will automatically call "makemap" if you have changed one of these files.) For all outgoing email, sendmail will use the destination hostname and look into /etc/mail/mailertable to see how this email should @@ -221,7 +221,7 @@ MAIL_CREATE_CONFIG=no in /etc/sysconfig/mail . /usr/share/sendmail contains m4 macro files that are often used to -generate a sendmail.cf file. (This is also done by /sbin/SuSEconfig +generate a sendmail.cf file. (This is also done by /usr/lib/sendmail.d/update for the simple configurations with /etc/sysconfig/sendmail and /etc/sysconfig/mail.) /etc/mail/linux.mc is a sample file with lots of comments about diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/suse/access new/sendmail-suse/suse/access --- old/sendmail-suse/suse/access 2006-08-10 11:32:29.000000000 +0200 +++ new/sendmail-suse/suse/access 2017-11-29 11:19:39.697613119 +0100 @@ -12,7 +12,7 @@ # # To enable this you have to set USE_ACCESS_DB # in /etc/sysconfig/sendmail to "yes" and run -# SuSEconfig. If you're not using SuSEconfig +# /usr/lib/sendmail.d/update. If you're not using this # you may have a look into your /etc/mail/linux.mc # # Format: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/suse/linux.mc new/sendmail-suse/suse/linux.mc --- old/sendmail-suse/suse/linux.mc 2006-08-10 11:32:29.000000000 +0200 +++ new/sendmail-suse/suse/linux.mc 2017-11-29 11:13:56.524137274 +0100 @@ -11,17 +11,17 @@ # include(`/usr/share/sendmail/m4/cf.m4') divert(0)dnl -VERSIONID(`@(#)Setup for SuSE Linux 0.5 (SuSE Linux) 2004/04/02')dnl +VERSIONID(`@(#)Setup for SUSE Linux 0.5 (SUSE Linux) 2004/04/02')dnl dnl -dnl This is the default configuration for SuSE Linux. +dnl This is the default configuration for SUSE Linux. dnl See `/usr/share/sendmail/ostype/suse-linux.m4' and take a look dnl into `/usr/share/sendmail/README' for more information. dnl dnl The suse-linux.m4 enables the FEATUREs mailertable, genericstable, dnl virtusertable, and access_db. Just look to those file for some dnl examples. They are stored in `/etc/mail/'. If you have changed -dnl one or more files you should run SuSEconfig or generate the -dnl `.db' files by hand (see /sbin/conf.d/SuSEconfig.sendmail). +dnl one or more files you should run SUSEconfig or generate the +dnl `.db' files by hand (see /sbin/conf.d/SUSEconfig.sendmail). dnl dnl NOTE: YOU HAVE TO CHANGE THE CONFIGURATION TO FIT YOUR NEEDS dnl BEFORE ACTIVTING SOME OF THESE EXAMPLES! @@ -45,7 +45,7 @@ dnl ifdef(`ALIAS_FILE', define(`ALIAS_FILE', ALIAS_FILE`,/etc/aliases.d/myaliases'))dnl dnl dnl By default the MSA (Message Submission Agent) daemon is disabled on -dnl SuSE Linux. If you want to use this service enabled the following. +dnl SUSE Linux. If you want to use this service enabled the following. dnl dnl DAEMON_OPTIONS(`Port=587,Name=MSA,M=E')dnl dnl @@ -104,7 +104,7 @@ dnl dnl define(`LUSER_RELAY', `local:postmaster')dnl dnl -dnl Enable the following SuSE FEATURE, if you have a expensive +dnl Enable the following SUSE FEATURE, if you have a expensive dnl dialup connection for SMTP and want to queue all email until dnl `sendmail -q' is started. dnl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/suse/linux.nullclient.mc new/sendmail-suse/suse/linux.nullclient.mc --- old/sendmail-suse/suse/linux.nullclient.mc 2006-08-10 11:32:29.000000000 +0200 +++ new/sendmail-suse/suse/linux.nullclient.mc 2017-11-29 11:14:39.747315598 +0100 @@ -13,9 +13,9 @@ include(`/usr/share/sendmail/m4/cf.m4') divert(0)dnl -VERSIONID(`@(#)Setup for SuSE Linux 0.2 (SuSE Linux) 2002/01/14') +VERSIONID(`@(#)Setup for SUSE Linux 0.2 (SUSE Linux) 2002/01/14') dnl -dnl This is the default configuration for SuSE Linux. +dnl This is the default configuration for SUSE Linux. dnl See /usr/share/sendmail/ostype/suse-linux.m4 dnl and /usr/share/sendmail/README for more information. dnl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/suse/linux.submit.mc new/sendmail-suse/suse/linux.submit.mc --- old/sendmail-suse/suse/linux.submit.mc 2006-08-10 11:32:29.000000000 +0200 +++ new/sendmail-suse/suse/linux.submit.mc 2017-11-29 11:14:53.291058126 +0100 @@ -19,7 +19,7 @@ define(`confSERVICE_SWITCH_FILE', `/etc/mail/service.switch')dnl define(`confEBINDIR', SMLIBDIR`/bin')dnl divert(0)dnl -VERSIONID(`@(#)Setup for SuSE Linux 0.1 (SuSE Linux) 2004/04/02')dnl +VERSIONID(`@(#)Setup for SUSE Linux 0.1 (SUSE Linux) 2004/04/02')dnl dnl dnl Enable trusted users file and OS trusted users dnl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/suse/messages/sendmail-local-only.de new/sendmail-suse/suse/messages/sendmail-local-only.de --- old/sendmail-suse/suse/messages/sendmail-local-only.de 2012-07-13 17:26:34.000000000 +0200 +++ new/sendmail-suse/suse/messages/sendmail-local-only.de 2017-11-29 11:18:18.023165934 +0100 @@ -11,4 +11,4 @@ Have a lot of fun... - Your SuSE Team + Your SUSE Team diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/suse/messages/sendmail-local-only.en new/sendmail-suse/suse/messages/sendmail-local-only.en --- old/sendmail-suse/suse/messages/sendmail-local-only.en 2006-08-10 11:32:29.000000000 +0200 +++ new/sendmail-suse/suse/messages/sendmail-local-only.en 2017-11-29 11:18:25.815017796 +0100 @@ -11,4 +11,4 @@ Have a lot of fun... - Your SuSE Team + Your SUSE Team diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/suse/sysconfig.mail-sendmail new/sendmail-suse/suse/sysconfig.mail-sendmail --- old/sendmail-suse/suse/sysconfig.mail-sendmail 2012-06-19 17:07:56.000000000 +0200 +++ new/sendmail-suse/suse/sysconfig.mail-sendmail 2017-11-29 11:17:49.815702210 +0100 @@ -4,10 +4,11 @@ ## Default: yes ## Config: sendmail,postfix # -# Set this to no, if SuSEconfig should not generate the configuration -# files (e.g. you want to generate your /etc/sendmail.cf yourself). -# Do you want to generate a sendmail-configuration /etc/sendmail.cf from -# parameters given in /etc/sysconfig/sendmail then use "yes" +# Set this to no, if /usr/lib/sendmail.d/update should not generate the +# configuration # files (e.g. you want to generate your /etc/sendmail.cf +# yourself). # Do you want to generate a sendmail-configuration +# /etc/sendmail.cf from # parameters given in /etc/sysconfig/sendmail +# then use "yes" # MAIL_CREATE_CONFIG="yes" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sendmail-suse/suse/update.sendmail new/sendmail-suse/suse/update.sendmail --- old/sendmail-suse/suse/update.sendmail 2017-04-12 15:27:03.942540586 +0200 +++ new/sendmail-suse/suse/update.sendmail 2017-11-29 11:13:04.057134655 +0100 @@ -117,7 +117,7 @@ divert(-1) include(\`/usr/share/sendmail/m4/cf.m4') divert(0)dnl - VERSIONID(\`@(#)Setup for SuSE Linux $VERSION (SuSE Linux) $DATE')dnl + VERSIONID(\`@(#)Setup for SUSE Linux $VERSION (SUSE Linux) $DATE')dnl OSTYPE(\`suse-linux')dnl EOF DAEMON_OPTIONS="" @@ -351,7 +351,7 @@ define(\`confSERVICE_SWITCH_FILE', \`/etc/mail/service.switch')dnl define(\`confEBINDIR', SMLIBDIR\`/bin')dnl divert(0)dnl - VERSIONID(\`@(#)Setup for SuSE Linux $VERSION (SuSE Linux) $DATE')dnl + VERSIONID(\`@(#)Setup for SUSE Linux $VERSION (SUSE Linux) $DATE')dnl EOF # # Enable trusted users file and OS trusted users @@ -432,7 +432,7 @@ divert(-1) include(\`/usr/share/sendmail/m4/cf.m4') divert(0)dnl - VERSIONID(\`@(#)Setup for SuSE Linux $VERSION (SuSE Linux) $DATE') + VERSIONID(\`@(#)Setup for SUSE Linux $VERSION (SUSE Linux) $DATE') OSTYPE(\`suse-linux')dnl FEATURE(\`nocanonify')dnl FEATURE(\`nullclient', \`$NULLCLIENT')dnl

1 0

commit aqbanking for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package aqbanking for openSUSE:Factory checked in at 2017-11-30 12:45:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aqbanking (Old) and /work/SRC/openSUSE:Factory/.aqbanking.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aqbanking" Thu Nov 30 12:45:49 2017 rev:73 rq:546418 version:5.7.6beta Changes: -------- --- /work/SRC/openSUSE:Factory/aqbanking/aqbanking.changes 2017-07-09 13:04:24.881272623 +0200 +++ /work/SRC/openSUSE:Factory/.aqbanking.new/aqbanking.changes 2017-11-30 12:45:53.196838588 +0100 @@ -1,0 +2,8 @@ +Mon Nov 27 09:52:31 UTC 2017 - dimstar(a)opensuse.org + +- Drop --with-qt4-libs configure parameter: no longer understood by + configure. +- Remove libqt4-devel BuildRequires: since --with-qt4-libs is not + understood anyway, we do not require the libst. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aqbanking.spec ++++++ --- /var/tmp/diff_new_pack.d6brCn/_old 2017-11-30 12:45:54.576788423 +0100 +++ /var/tmp/diff_new_pack.d6brCn/_new 2017-11-30 12:45:54.580788278 +0100 @@ -49,7 +49,6 @@ BuildRequires: gwenhywfar-devel >= 4.10.0 BuildRequires: gwenhywfar-tools >= 4.10.0 BuildRequires: ktoblzcheck-devel >= 1.10 -BuildRequires: libqt4-devel BuildRequires: pkgconfig %if !0%{?sles_version} BuildRequires: pkgconfig(gtk+-2.0) @@ -174,7 +173,6 @@ --enable-release $builddate \ --with-backends="$BACKEND_LIST" \ --enable-full-doc \ - --with-qt4-libs=%{_libdir} \ --with-docpath=%{_docdir}/%{name} \ --enable-gui-tests make

1 0

commit xboxdrv for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package xboxdrv for openSUSE:Factory checked in at 2017-11-30 12:45:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xboxdrv (Old) and /work/SRC/openSUSE:Factory/.xboxdrv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xboxdrv" Thu Nov 30 12:45:45 2017 rev:5 rq:546400 version:0.8.8 Changes: -------- --- /work/SRC/openSUSE:Factory/xboxdrv/xboxdrv.changes 2017-02-21 13:49:08.398574558 +0100 +++ /work/SRC/openSUSE:Factory/.xboxdrv.new/xboxdrv.changes 2017-11-30 12:45:51.676893842 +0100 @@ -1,0 +2,8 @@ +Fri Nov 24 13:31:07 UTC 2017 - mpluskal(a)suse.com + +- Fix building with python3 version of scons: + * xboxdrv-scons3.patch +- Small cleanup with spec-clenaer +- Update dependencies for Factory + +------------------------------------------------------------------- New: ---- xboxdrv-scons3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xboxdrv.spec ++++++ --- /var/tmp/diff_new_pack.PEHRUJ/_old 2017-11-30 12:45:52.884849930 +0100 +++ /var/tmp/diff_new_pack.PEHRUJ/_new 2017-11-30 12:45:52.888849784 +0100 @@ -29,6 +29,8 @@ Source3: %{name}.service # PATCH-FIX-UPSTREAM xboxdrv-fix-delay.patch -- Fix 60 seconds delay, from https://github.com/xboxdrv/xboxdrv/pull/214 Patch0: %{name}-fix-delay.patch +# PATCH-FIX-UPSTREAM xboxdrv-scons3.patch -- Fix build with python, from https://github.com/xboxdrv/xboxdrv/pull/240 +Patch1: xboxdrv-scons3.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: scons @@ -36,11 +38,12 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(x11) -Requires: dbus-1-python %if 0%{?suse_version} > 1320 BuildRequires: libboost_headers-devel +Requires: python2-dbus-python %else BuildRequires: boost-devel +Requires: dbus-1-python %endif %description @@ -54,6 +57,7 @@ %prep %setup -q -n %{name}-linux-%{version} %patch0 -p1 +%patch1 -p1 cp -f %{SOURCE1} 50-xpad.conf cp -f %{SOURCE2} %{name}.conf cp -f %{SOURCE3} %{name}.service @@ -92,7 +96,6 @@ %service_del_postun %{name}.service %files -%defattr(-,root,root) %doc AUTHORS COPYING NEWS PROTOCOL README.md TODO %config(noreplace) %{_sysconfdir}/%{name}.conf %dir %{_sysconfdir}/modprobe.d/ ++++++ xboxdrv-scons3.patch ++++++ >From 17bd43a7d3ef86216abc36b42b4e6a1f70aa9979 Mon Sep 17 00:00:00 2001 From: xnick <xnick(a)users.noreply.github.com> Date: Thu, 12 Oct 2017 20:34:35 +0300 Subject: [PATCH] Update SConstruct python3 compatible --- SConstruct | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index 4cd79704..c0007054 100644 --- a/SConstruct +++ b/SConstruct @@ -19,7 +19,7 @@ def build_dbus_glue(target, source, env): xml = re.sub(r"callback = $([A-Za-z_]+)$ $marshal_data \? marshal_data : cc->callback$;", r"union { \1 fn; void* obj; } conv;\n " "conv.obj = (marshal_data ? marshal_data : cc->callback);\n " - "callback = conv.fn;", xml) + "callback = conv.fn;", xml.decode('utf-8')) with open(target[0].get_path(), "w") as f: f.write(xml) @@ -29,10 +29,10 @@ def build_bin2h(target, source, env): Takes a list of files and converts them into a C source that can be included """ def c_escape(str): - return str.translate(string.maketrans("/.-", "___")) + return str.translate(bytes.maketrans(b"/.-", b"___")) - print target - print source + print(target) + print(source) with open(target[0].get_path(), "w") as fout: fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n") @@ -45,8 +45,8 @@ def build_bin2h(target, source, env): data = fin.read() fout.write("// \"%s\"\n" % src.get_path()) fout.write("const char %s[] = {" % c_escape(src.get_path())) - bytes_arr = ["0x%02x" % ord(c) for c in data] - for i in xrange(len(bytes_arr)): + bytes_arr = ["0x%02x" % c for c in data] + for i in range(len(bytes_arr)): if i % 13 == 0: fout.write("\n ") fout.write(bytes_arr[i]) @@ -131,12 +131,12 @@ env.Append(CPPDEFINES = { 'PACKAGE_VERSION': "'\"%s\"'" % package_version }) conf = Configure(env) if not conf.env['CXX']: - print "g++ must be installed!" + print('g++ must be installed!') Exit(1) # X11 checks if not conf.CheckLibWithHeader('X11', 'X11/Xlib.h', 'C++'): - print 'libx11-dev must be installed!' + print('libx11-dev must be installed!') Exit(1) env = conf.Finish()

1 0

commit d-feet for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package d-feet for openSUSE:Factory checked in at 2017-11-30 12:45:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/d-feet (Old) and /work/SRC/openSUSE:Factory/.d-feet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "d-feet" Thu Nov 30 12:45:43 2017 rev:35 rq:546393 version:0.3.13 Changes: -------- --- /work/SRC/openSUSE:Factory/d-feet/d-feet.changes 2017-08-28 15:14:19.864619552 +0200 +++ /work/SRC/openSUSE:Factory/.d-feet.new/d-feet.changes 2017-11-30 12:45:50.364941536 +0100 @@ -1,0 +2,30 @@ +Fri Nov 24 22:09:50 UTC 2017 - zaitor(a)opensuse.org + +- Update to version 0.3.13: + + Use locale.textdomain otherwise gtkbuilder translations don't + work. + + gitignore: Ignore generated localized help files. + + build: + - Put various Autotools droppings in build-aux. + - Stop using GNOME_COMPILE_WARNINGS. + - Replace deprecated use of gnome-autogen.sh with recommended + autogen.sh. + - Put third-party macros in m4. + + Make pep8 happy. + + ExecuteMethodDialog: set_transient_for(). + + ExecuteMethodDialog: Pretty-print multiple results. + + Fix PEP8 305 style error. + + Show values that have a logical False representation. + + Updated translations. +- Drop + d-feet-Show-values-that-have-logical-False-representation.patch: + Fixed upstream. +- Drop update-desktop-files BuildRequires and + suse_update_desktop_file macro, no longer needed. +- Drop obsolete post(un) handling of icon_theme_cache_post(un), + desktop_database_post(un) and glib2_gsettings_schema_post(un), we + have file-triggers taking care of this now. +- Run spec-cleaner, modernize spec, use autosetup and make_build + macros. + +------------------------------------------------------------------- Old: ---- d-feet-0.3.12.tar.xz d-feet-Show-values-that-have-logical-False-representation.patch New: ---- d-feet-0.3.13.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ d-feet.spec ++++++ --- /var/tmp/diff_new_pack.YOq0IJ/_old 2017-11-30 12:45:51.324906638 +0100 +++ /var/tmp/diff_new_pack.YOq0IJ/_new 2017-11-30 12:45:51.324906638 +0100 @@ -17,25 +17,21 @@ Name: d-feet -Version: 0.3.12 +Version: 0.3.13 Release: 0 Summary: Graphical D-Bus Debugger License: GPL-2.0+ Group: Development/Tools/Debuggers Url: http://live.gnome.org/DFeet/ Source0: http://download.gnome.org/sources/d-feet/0.3/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM d-feet-Show-values-that-have-logical-False-representation.patch bgo#783006 zaitor(a)opensuse.org -- Show values that have a logical False representation -Patch0: d-feet-Show-values-that-have-logical-False-representation.patch BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: intltool >= 0.40.0 BuildRequires: python-pep8 -BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.6 BuildRequires: pkgconfig(gtk+-3.0) >= 3.9.4 -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Recommends: %{name}-lang %py_requires @@ -46,33 +42,20 @@ programs and invoke methods on those objects. %lang_package + %prep -%setup -q -%patch0 -p1 +%autosetup %build %configure %install %make_install -%suse_update_desktop_file -N "D-Feet D-Bus Debugger" %{name} + %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot} -%post -%icon_theme_cache_post -%icon_theme_cache_post HighContrast -%desktop_database_post -%glib2_gsettings_schema_post - -%postun -%icon_theme_cache_postun -%icon_theme_cache_postun HighContrast -%desktop_database_postun -%glib2_gsettings_schema_postun - %files -%defattr(-,root,root,-) %doc AUTHORS COPYING README %doc %{_datadir}/help/C/%{name}/ %{_bindir}/%{name} ++++++ d-feet-0.3.12.tar.xz -> d-feet-0.3.13.tar.xz ++++++ ++++ 7988 lines of diff (skipped)

1 0

commit epiphany for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package epiphany for openSUSE:Factory checked in at 2017-11-30 12:45:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/epiphany (Old) and /work/SRC/openSUSE:Factory/.epiphany.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "epiphany" Thu Nov 30 12:45:40 2017 rev:144 rq:546392 version:3.26.3 Changes: -------- --- /work/SRC/openSUSE:Factory/epiphany/epiphany.changes 2017-11-03 16:26:22.296888271 +0100 +++ /work/SRC/openSUSE:Factory/.epiphany.new/epiphany.changes 2017-11-30 12:45:46.861068912 +0100 @@ -1,0 +2,17 @@ +Sun Nov 26 15:58:32 UTC 2017 - zaitor(a)opensuse.org + +- Update to version 3.26.3: + + Don't require gvfsd-http for downloading adblock filters + (bgo#776682). + + Several improvements to Sync support (bgo#789656, bgo#789786, + bgo#790286). + + Make downloads work when running in flatpak (bgo#785655). + + Do not add bookmarks to unrelated tag view popovers + (bgo#788584). + + Fix middle click on forward/back buttons (bgo#790017). + + "Search the Web for ..." context menu option now switches to + new tab (bgo#790693). +- Drop update-desktop-files BuildRequires and no longer use + suse_update_desktop_file macro, no longer needed. + +------------------------------------------------------------------- Old: ---- epiphany-3.26.2.tar.xz New: ---- epiphany-3.26.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epiphany.spec ++++++ --- /var/tmp/diff_new_pack.DCfqg7/_old 2017-11-30 12:45:48.617005079 +0100 +++ /var/tmp/diff_new_pack.DCfqg7/_new 2017-11-30 12:45:48.625004788 +0100 @@ -17,18 +17,17 @@ Name: epiphany -Version: 3.26.2 +Version: 3.26.3 Release: 0 Summary: GNOME Web Browser License: GPL-3.0+ Group: Productivity/Networking/Web/Browsers Url: http://www.gnome.org/projects/epiphany/ -Source: http://download.gnome.org/sources/epiphany/3.26/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/epiphany/3.26/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc BuildRequires: fdupes BuildRequires: meson BuildRequires: pkgconfig -BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(cairo) >= 1.2 BuildRequires: pkgconfig(gcr-3) >= 3.5.5 @@ -98,7 +97,7 @@ %lang_package %prep -%setup -q +%autosetup %if ! 0%{?is_opensuse} translation-update-upstream %endif @@ -111,7 +110,7 @@ %install %{meson_install} -%suse_update_desktop_file org.gnome.Epiphany + %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot} ++++++ epiphany-3.26.2.tar.xz -> epiphany-3.26.3.tar.xz ++++++ ++++ 12954 lines of diff (skipped)

1 0

commit python-jedihttp for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package python-jedihttp for openSUSE:Factory checked in at 2017-11-30 12:45:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jedihttp (Old) and /work/SRC/openSUSE:Factory/.python-jedihttp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jedihttp" Thu Nov 30 12:45:35 2017 rev:2 rq:546377 version:0+git.1497381496.75b8b74 Changes: -------- --- /work/SRC/openSUSE:Factory/python-jedihttp/python-jedihttp.changes 2017-08-04 11:58:28.327316828 +0200 +++ /work/SRC/openSUSE:Factory/.python-jedihttp.new/python-jedihttp.changes 2017-11-30 12:45:40.625295602 +0100 @@ -1,0 +2,5 @@ +Wed Nov 29 09:01:45 UTC 2017 - cbosdonnat(a)suse.com + +- Don't run the tests: those are too fragile + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jedihttp.spec ++++++ --- /var/tmp/diff_new_pack.GsBJaX/_old 2017-11-30 12:45:41.601260123 +0100 +++ /var/tmp/diff_new_pack.GsBJaX/_new 2017-11-30 12:45:41.605259977 +0100 @@ -66,9 +66,6 @@ %python_clone %{buildroot}%{_bindir}/jedihttp-server %python_expand %fdupes %{buildroot}%{$python_sitelib} -%check -%python_exec %{_bindir}/nosetests -v - %files %python_files %defattr(-,root,root) %doc README.md LICENSE NOTICE

1 0

commit pasystray for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package pasystray for openSUSE:Factory checked in at 2017-11-30 12:45:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pasystray (Old) and /work/SRC/openSUSE:Factory/.pasystray.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pasystray" Thu Nov 30 12:45:34 2017 rev:3 rq:546363 version:0.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/pasystray/pasystray.changes 2016-07-20 09:24:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pasystray.new/pasystray.changes 2017-11-30 12:45:39.761327011 +0100 @@ -1,0 +2,6 @@ +Tue Nov 28 16:37:54 UTC 2017 - petr(a)cervinka.net + +- Add upstream patch fix-memory-leak.patch for memory leak (boo#1070195) +- spec file cleaned + +------------------------------------------------------------------- New: ---- fix-memory-leak.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pasystray.spec ++++++ --- /var/tmp/diff_new_pack.Nh1u0O/_old 2017-11-30 12:45:40.445302146 +0100 +++ /var/tmp/diff_new_pack.Nh1u0O/_new 2017-11-30 12:45:40.449302001 +0100 @@ -1,7 +1,7 @@ # # spec file for package pasystray # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,8 @@ Group: System/GUI/Other Url: https://github.com/christophgysin/pasystray Source: https://github.com/christophgysin/pasystray/archive/pasystray-%{version}.ta… +# PATCH-FIX-UPSTREAM fix-memory-leak.patch boo#1070195 +Patch0: fix-memory-leak.patch BuildRequires: automake BuildRequires: pkgconfig BuildRequires: update-desktop-files @@ -51,7 +53,6 @@ Suggests: paprefs Suggests: pavucontrol Suggests: pavumeter -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{build_wayland_backend} BuildRequires: pkgconfig(gdk-wayland-3.0) BuildRequires: pkgconfig(gtk+-wayland-3.0) @@ -64,6 +65,7 @@ %prep %setup -q -n %{name}-%{name}-%{version} +%patch0 -p1 %build autoreconf -fi @@ -71,12 +73,11 @@ make %{?_smp_mflags} %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install %suse_update_desktop_file -u -r %{buildroot}%{_datadir}/applications/pasystray.desktop AudioVideo Mixer %suse_update_desktop_file -u -r %{buildroot}%{_sysconfdir}/xdg/autostart/pasystray.desktop AudioVideo Mixer %files -%defattr(-,root,root) %doc AUTHORS LICENSE README.md TODO %dir %{_datadir}/pasystray %{_sysconfdir}/xdg/autostart/pasystray.desktop ++++++ fix-memory-leak.patch ++++++ >From 23806233251ea77cf43921220cac5b66874b481a Mon Sep 17 00:00:00 2001 From: Christoph Gysin <christoph.gysin(a)gmail.com> Date: Sat, 11 Nov 2017 18:04:32 +0200 Subject: [PATCH] systray: fix memory leak Thanks to @l12436 fixes #94 --- src/systray.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/systray.c b/src/systray.c index 58dbc71..dfe806d 100644 --- a/src/systray.c +++ b/src/systray.c @@ -144,8 +144,10 @@ void systray_remove_placeholder(menu_info_t* mi) if(g_hash_table_size(mi->items) == 0) { GList* children = gtk_container_get_children(GTK_CONTAINER(mi->menu)); - if(children) + if(children) { gtk_container_remove(GTK_CONTAINER(mi->menu), GTK_WIDGET(children->data)); + g_list_free(children); + } } } @@ -192,10 +194,12 @@ void systray_remove_radio_item(menu_info_t* mi, GtkWidget* item) /* update group */ GList* children = gtk_container_get_children(GTK_CONTAINER(mi->menu)); - if(children) + if(children) { mi->group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(children->data)); - else + g_list_free(children); + } else { mi->group = NULL; + } } GtkWidget* systray_add_item(GtkMenuShell* menu, const char* desc, const char* tooltip, const char* icon)

1 0

commit xfce4-terminal for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package xfce4-terminal for openSUSE:Factory checked in at 2017-11-30 12:45:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-terminal (Old) and /work/SRC/openSUSE:Factory/.xfce4-terminal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-terminal" Thu Nov 30 12:45:32 2017 rev:17 rq:546356 version:0.8.6 Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-terminal/xfce4-terminal.changes 2017-06-17 10:22:33.519396267 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-terminal.new/xfce4-terminal.changes 2017-11-30 12:45:34.849505571 +0100 @@ -1,0 +2,20 @@ +Wed Nov 22 18:56:02 UTC 2017 - seife+obs(a)b1-systems.com + +- Update to version 0.8.6: + - Fix handling email addresses + - Allow per-tab configuration of dynamic tytle mode and initial + title by adding --dynamic-tytle-mode and --initial-title + options (bxo#2908) + - Migrate tab 'Set Title' dialog to a gtk popover (bxo#13522) + - Add option to select cursor foreground (text) color + - Fix drop-down terminal ignoring 'move to monitor with pointer' + option (bxo#13666) + - Disable Ctrl+PgUp/PgDn shortcuts with only one tab (bxo#10469) + - Fix negative dimensions GTK warning when running terminal with + --tab option + - Update regexes from gnome-terminal + - Fix --tab option broken lately (bxo#13587) + - Fix drop-down window positioning when using --zoom option + - Translation updates + +------------------------------------------------------------------- Old: ---- xfce4-terminal-0.8.5.1.tar.bz2 New: ---- xfce4-terminal-0.8.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-terminal.spec ++++++ --- /var/tmp/diff_new_pack.pj3yvq/_old 2017-11-30 12:45:35.605478089 +0100 +++ /var/tmp/diff_new_pack.pj3yvq/_new 2017-11-30 12:45:35.605478089 +0100 @@ -18,7 +18,7 @@ Name: xfce4-terminal -Version: 0.8.5.1 +Version: 0.8.6 Release: 0 Summary: Terminal Emulator for the Xfce Desktop Environment License: GPL-2.0+ ++++++ xfce4-terminal-0.8.5.1.tar.bz2 -> xfce4-terminal-0.8.6.tar.bz2 ++++++ ++++ 30780 lines of diff (skipped)

1 0

commit platformsh-cli for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package platformsh-cli for openSUSE:Factory checked in at 2017-11-30 12:45:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/platformsh-cli (Old) and /work/SRC/openSUSE:Factory/.platformsh-cli.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "platformsh-cli" Thu Nov 30 12:45:29 2017 rev:25 rq:546338 version:3.23.0 Changes: -------- --- /work/SRC/openSUSE:Factory/platformsh-cli/platformsh-cli.changes 2017-11-17 11:00:56.714655402 +0100 +++ /work/SRC/openSUSE:Factory/.platformsh-cli.new/platformsh-cli.changes 2017-11-30 12:45:32.137604158 +0100 @@ -1,0 +2,12 @@ +Wed Nov 29 03:34:04 UTC 2017 - jimmy(a)boombatower.com + +- Update to version 3.23.0: + * Release v3.23.0 + * mount commands: add --exclude and --include (#651) + * Allow projects to be identified from their public website URL (#649) + * Add excluded_environments option for webhooks (#652) + * Add GitLab integration support (#647) + * Improve mount commands output + * Support new mount style + +------------------------------------------------------------------- Old: ---- platformsh-cli-3.22.3.tar.xz New: ---- platformsh-cli-3.23.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ platformsh-cli.spec ++++++ --- /var/tmp/diff_new_pack.yCeASk/_old 2017-11-30 12:45:33.189565916 +0100 +++ /var/tmp/diff_new_pack.yCeASk/_new 2017-11-30 12:45:33.193565770 +0100 @@ -17,7 +17,7 @@ Name: platformsh-cli -Version: 3.22.3 +Version: 3.23.0 Release: 0 Summary: Tool for managing Platform.sh services from the command line # See licenses.txt for dependency licenses. ++++++ _service ++++++ --- /var/tmp/diff_new_pack.yCeASk/_old 2017-11-30 12:45:33.233564316 +0100 +++ /var/tmp/diff_new_pack.yCeASk/_new 2017-11-30 12:45:33.233564316 +0100 @@ -2,7 +2,7 @@ <service name="tar_scm" mode="disabled"> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> - <param name="revision">refs/tags/v3.22.3</param> + <param name="revision">refs/tags/v3.23.0</param> <param name="url">git://github.com/platformsh/platformsh-cli.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.yCeASk/_old 2017-11-30 12:45:33.257563444 +0100 +++ /var/tmp/diff_new_pack.yCeASk/_new 2017-11-30 12:45:33.261563298 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/platformsh/platformsh-cli.git</param> - <param name="changesrevision">da1c7f22409c1b63dd2dd23d99542774506b41c7</param> + <param name="changesrevision">2eed15b1fd4791dd1b4e4050b648b6823c06dfc4</param> </service> </servicedata> ++++++ licenses.txt ++++++ --- /var/tmp/diff_new_pack.yCeASk/_old 2017-11-30 12:45:33.317561263 +0100 +++ /var/tmp/diff_new_pack.yCeASk/_new 2017-11-30 12:45:33.317561263 +0100 @@ -15,7 +15,7 @@ guzzlehttp/streams 3.0.0 MIT padraic/humbug_get_contents 1.0.4 BSD-3-Clause padraic/phar-updater 1.0.4 BSD-3-Clause -platformsh/client v0.12.0 MIT +platformsh/client v0.12.1 MIT platformsh/console-form v0.0.13 MIT psr/container 1.0.0 MIT psr/log 1.0.2 MIT ++++++ platformsh-cli-3.22.3.tar.xz -> platformsh-cli-3.23.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/composer.lock new/platformsh-cli-3.23.0/composer.lock --- old/platformsh-cli-3.22.3/composer.lock 2017-11-16 11:12:57.000000000 +0100 +++ new/platformsh-cli-3.23.0/composer.lock 2017-11-24 17:31:28.000000000 +0100 @@ -594,16 +594,16 @@ }, { "name": "platformsh/client", - "version": "v0.12.0", + "version": "v0.12.1", "source": { "type": "git", "url": "https://github.com/platformsh/platformsh-client-php.git", - "reference": "e5ce468ddc35d8a95fff79579a17b076cd5831c4" + "reference": "945ba687f110c3c74e8c250b1b4afd2d03062c7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/platformsh/platformsh-client-php/zipball/e5ce4…", - "reference": "e5ce468ddc35d8a95fff79579a17b076cd5831c4", + "url": "https://api.github.com/repos/platformsh/platformsh-client-php/zipball/945ba…", + "reference": "945ba687f110c3c74e8c250b1b4afd2d03062c7c", "shasum": "" }, "require": { @@ -639,7 +639,7 @@ } ], "description": "Platform.sh API client", - "time": "2017-09-20T08:28:37+00:00" + "time": "2017-11-16T12:15:47+00:00" }, { "name": "platformsh/console-form", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/config.yaml new/platformsh-cli-3.23.0/config.yaml --- old/platformsh-cli-3.22.3/config.yaml 2017-11-16 11:12:57.000000000 +0100 +++ new/platformsh-cli-3.23.0/config.yaml 2017-11-24 17:31:28.000000000 +0100 @@ -1,7 +1,7 @@ # Metadata about the CLI application itself. application: name: 'Platform.sh CLI' - version: '3.22.3' + version: '3.23.0' executable: 'platform' package_name: 'platformsh/cli' installer_url: 'https://platform.sh/cli/installer' @@ -33,6 +33,7 @@ service: name: 'Platform.sh' env_prefix: 'PLATFORM_' + header_prefix: 'X-Platform' app_config_file: '.platform.app.yaml' project_config_dir: '.platform' docs_url: 'https://docs.platform.sh' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/services.yaml new/platformsh-cli-3.23.0/services.yaml --- old/platformsh-cli-3.22.3/services.yaml 2017-11-16 11:12:57.000000000 +0100 +++ new/platformsh-cli-3.23.0/services.yaml 2017-11-24 17:31:28.000000000 +0100 @@ -22,6 +22,9 @@ git: class: '\Platformsh\Cli\Service\Git' arguments: ['@shell'] + identifier: + class: '\Platformsh\Cli\Service\Identifier' + arguments: ['@config', '@api', '@output', '@cache'] local.build: class: '\Platformsh\Cli\Local\LocalBuild' arguments: ['@config', '@output', '@shell', '@fs', '@git', '@local.dependency_installer'] @@ -31,6 +34,8 @@ local.project: class: '\Platformsh\Cli\Local\LocalProject' arguments: ['@config', '@git'] + mount: + class: '\Platformsh\Cli\Service\Mount' output: class: '\Symfony\Component\Console\Output\ConsoleOutput' property_formatter: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/src/Command/CommandBase.php new/platformsh-cli-3.23.0/src/Command/CommandBase.php --- old/platformsh-cli-3.22.3/src/Command/CommandBase.php 2017-11-16 11:12:57.000000000 +0100 +++ new/platformsh-cli-3.23.0/src/Command/CommandBase.php 2017-11-24 17:31:28.000000000 +0100 @@ -555,7 +555,7 @@ */ protected function addProjectOption() { - $this->addOption('project', 'p', InputOption::VALUE_REQUIRED, 'The project ID'); + $this->addOption('project', 'p', InputOption::VALUE_REQUIRED, 'The project ID or URL'); $this->addOption('host', null, InputOption::VALUE_REQUIRED, "The project's API hostname"); return $this; @@ -622,6 +622,7 @@ } $this->project = $project; + $this->debug('Selected project: ' . $project->id); return $this->project; } @@ -656,6 +657,7 @@ } $this->environment = $environment; + $this->debug('Selected environment: ' . $environment->id); return; } @@ -714,71 +716,6 @@ } /** - * Parse the project ID and possibly other details from a provided URL. - * - * @param string $url - * A web UI, API, or public URL of the project. - * - * @throws \InvalidArgumentException - * If the project ID can't be found in the URL. - * - * @return array - * An array of containing at least a 'projectId'. Keys 'host', - * 'environmentId', and 'appId' will be either null or strings. - */ - protected function parseProjectId($url) - { - $result = [ - 'projectId' => null, - 'host' => null, - 'environmentId' => null, - 'appId' => null, - ]; - - // If it's a plain alphanumeric string, then it's an ID already. - if (!preg_match('/\W/', $url)) { - $result['projectId'] = $url; - - return $result; - } - - $this->debug('Parsing URL to determine project ID'); - - $host = parse_url($url, PHP_URL_HOST); - $path = parse_url($url, PHP_URL_PATH); - $site_domains_pattern = '(' . implode('|', array_map('preg_quote', $this->config()->get('detection.site_domains'))) . ')'; - $site_pattern = '/\-\w+\.[a-z]{2}(\-[0-9])?\.' . $site_domains_pattern . '$/'; - if (!strpos($path, '/projects/') - && preg_match($site_pattern, $host)) { - list($env_project_app,) = explode('.', $host, 2); - if (($tripleDashPos = strrpos($env_project_app, '---')) !== false) { - $env_project_app = substr($env_project_app, $tripleDashPos + 3); - } - if (($doubleDashPos = strrpos($env_project_app, '--')) !== false) { - $env_project = substr($env_project_app, 0, $doubleDashPos); - $result['appId'] = substr($env_project_app, $doubleDashPos + 2); - } else { - $env_project = $env_project_app; - } - if (($dashPos = strrpos($env_project, '-')) !== false) { - $result['projectId'] = substr($env_project, $dashPos + 1); - $result['environmentId'] = substr($env_project, 0, $dashPos); - } - } else { - $result['host'] = $host; - $result['projectId'] = basename(preg_replace('#/projects(/\w+)/?.*$#', '$1', $url)); - if (preg_match('#/environments(/[^/]+)/?.*$#', $url, $matches)) { - $result['environmentId'] = rawurldecode(basename($matches[1])); - } - } - if (empty($result['projectId']) || preg_match('/\W/', $result['projectId'])) { - throw new ConsoleInvalidArgumentException(sprintf('Invalid project URL: %s', $url)); - } - - return $result; - } - - /** * Offer the user an interactive choice of projects. * * @param Project[] $projects @@ -810,9 +747,11 @@ $projectHost = $input->hasOption('host') ? $input->getOption('host') : null; $environmentId = null; - // Parse the project ID. + // Identify the project. if ($projectId !== null) { - $result = $this->parseProjectId($projectId); + /** @var \Platformsh\Cli\Service\Identifier $identifier */ + $identifier = $this->getService('identifier'); + $result = $identifier->identify($projectId); $projectId = $result['projectId']; $projectHost = $projectHost ?: $result['host']; $environmentId = $result['environmentId']; @@ -835,7 +774,7 @@ if (isset($result) && isset($result['appId'])) { $input->setOption('app', $result['appId']); $this->debug(sprintf( - 'App name detected from project URL as: %s', + 'App name identified as: %s', $input->getOption('app') )); } @@ -877,8 +816,6 @@ $environmentId = $input->getOption($envOptionName) ?: $environmentId; $this->selectEnvironment($environmentId, !$envNotRequired); } - - $this->debug('Validated input'); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/src/Command/Integration/IntegrationAddCommand.php new/platformsh-cli-3.23.0/src/Command/Integration/IntegrationAddCommand.php --- old/platformsh-cli-3.22.3/src/Command/Integration/IntegrationAddCommand.php 2017-11-16 11:12:57.000000000 +0100 +++ new/platformsh-cli-3.23.0/src/Command/Integration/IntegrationAddCommand.php 2017-11-24 17:31:28.000000000 +0100 @@ -19,7 +19,11 @@ $this->addProjectOption()->addNoWaitOption(); $this->addExample( 'Add an integration with a GitHub repository', - '--type github --repository myuser/example-repo --token UFpYS1MzQktjNw --fetch-branches 0' + '--type github --repository myuser/example-repo --token 9218376e14c2797e0d06e8d2f918d45f --fetch-branches 0' + ); + $this->addExample( + 'Add an integration with a GitLab repository', + '--type gitlab --repository mygroup/example-repo --token 22fe4d70dfbc20e4f668568a0b5422e2 --base-url https://gitlab.example.com' ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/src/Command/Integration/IntegrationCommandBase.php new/platformsh-cli-3.23.0/src/Command/Integration/IntegrationCommandBase.php --- old/platformsh-cli-3.22.3/src/Command/Integration/IntegrationCommandBase.php 2017-11-16 11:12:57.000000000 +0100 +++ new/platformsh-cli-3.23.0/src/Command/Integration/IntegrationCommandBase.php 2017-11-24 17:31:28.000000000 +0100 @@ -35,6 +35,7 @@ { $types = [ 'github', + 'gitlab', 'hipchat', 'webhook', 'health.email', @@ -51,11 +52,28 @@ 'token' => new Field('Token', [ 'conditions' => ['type' => [ 'github', + 'gitlab', 'hipchat', 'health.slack', ]], 'description' => 'An OAuth token for the integration', ]), + 'base_url' => new Field('Base URL', [ + 'conditions' => ['type' => [ + 'gitlab', + ]], + 'description' => 'The base URL of the GitLab installation', + ]), + 'project' => new Field('Project', [ + 'optionName' => 'gitlab-project', + 'conditions' => ['type' => [ + 'gitlab', + ]], + 'description' => 'The GitLab project (e.g. \'namespace/repo\')', + 'validator' => function ($string) { + return substr_count($string, '/', 1) === 1; + }, + ]), 'repository' => new Field('Repository', [ 'conditions' => ['type' => [ 'github', @@ -72,6 +90,12 @@ return $string; }, ]), + 'build_merge_requests' => new BooleanField('Build merge requests', [ + 'conditions' => ['type' => [ + 'gitlab', + ]], + 'description' => 'GitLab: build merge requests as environments', + ]), 'build_pull_requests' => new BooleanField('Build pull requests', [ 'conditions' => ['type' => [ 'github', @@ -84,6 +108,13 @@ ]], 'description' => 'GitHub: build pull requests based on their post-merge state', ]), + 'merge_requests_clone_parent_data' => new BooleanField('Clone data for merge requests', [ + 'optionName' => 'merge-requests-clone-parent-data', + 'conditions' => ['type' => [ + 'gitlab', + ]], + 'description' => 'GitLab: clone data for merge requests', + ]), 'pull_requests_clone_parent_data' => new BooleanField('Clone data for pull requests', [ 'optionName' => 'pull-requests-clone-parent-data', 'conditions' => ['type' => [ @@ -94,8 +125,9 @@ 'fetch_branches' => new BooleanField('Fetch branches', [ 'conditions' => ['type' => [ 'github', + 'gitlab', ]], - 'description' => 'GitHub: sync all branches', + 'description' => 'Whether to sync all branches', ]), 'room' => new Field('HipChat room ID', [ 'conditions' => ['type' => [ @@ -131,9 +163,18 @@ 'environments' => new ArrayField('Environments', [ 'conditions' => ['type' => [ 'webhook', + 'hipchat', ]], 'default' => ['*'], - 'description' => 'Generic webhook: the environments relevant to the hook', + 'description' => 'The environments to include', + ]), + 'excluded_environments' => new ArrayField('Excluded environments', [ + 'conditions' => ['type' => [ + 'webhook', + 'hipchat', + ]], + 'default' => [], + 'description' => 'The environments to exclude', ]), 'from_address' => new EmailAddressField('From address', [ 'conditions' => ['type' => [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/src/Command/Mount/MountCommandBase.php new/platformsh-cli-3.23.0/src/Command/Mount/MountCommandBase.php --- old/platformsh-cli-3.22.3/src/Command/Mount/MountCommandBase.php 2017-11-16 11:12:57.000000000 +0100 +++ new/platformsh-cli-3.23.0/src/Command/Mount/MountCommandBase.php 2017-11-24 17:31:28.000000000 +0100 @@ -7,7 +7,6 @@ abstract class MountCommandBase extends CommandBase { - /** * Get the remote application config. * @@ -37,68 +36,13 @@ { $options = []; foreach ($mounts as $path => $id) { - $normalized = $this->normalizeMountPath($path); - $options[$normalized] = sprintf('<question>%s</question>: %s', $normalized, trim($id, '/')); + $options[$path] = sprintf('<question>%s</question>: %s', $path, trim($id, '/')); } return $options; } /** - * Get the path under '.platform/local/shared' for a mount. - * - * @param string $path - * @param array $mounts - * - * @return string|false - */ - protected function getSharedPath($path, array $mounts) - { - $normalized = $this->normalizeMountPath($path); - foreach ($mounts as $path => $uri) { - if ($this->normalizeMountPath($path) === $normalized - && preg_match('#^shared:files/(.+)$#', $uri, $matches)) { - return trim($matches[1], '/'); - } - } - - return false; - } - - /** - * Normalize a path to a mount. - * - * @param string $path - * - * @return string - */ - protected function normalizeMountPath($path) - { - return trim(trim($path), '/'); - } - - /** - * Validate and normalize a path to a mount. - * - * @param string $inputPath - * @param array $mounts - * - * @return string - * The normalized mount path. - */ - protected function validateMountPath($inputPath, array $mounts) - { - $normalized = trim(trim($inputPath), '/'); - foreach (array_keys($mounts) as $path) { - if (trim(trim($path), '/') === $normalized) { - return $normalized; - } - } - - throw new \InvalidArgumentException(sprintf('Mount not found: <error>%s</error>', $inputPath)); - } - - /** * Validate a directory argument. * * @param string $directory @@ -122,21 +66,15 @@ * @param string $mountPath * @param string $localPath * @param bool $up - * @param bool $delete + * @param array $options */ - protected function runSync($sshUrl, $mountPath, $localPath, $up, $delete = false) + protected function runSync($sshUrl, $mountPath, $localPath, $up, array $options = []) { /** @var \Platformsh\Cli\Service\Shell $shell */ $shell = $this->getService('shell'); $mountPathAbsolute = $this->getAppDir($sshUrl) . '/' . $mountPath; - if ($up) { - $this->stdErr->writeln(sprintf('Uploading files from <info>%s</info> to the remote mount <info>%s</info>', $localPath, $mountPathAbsolute)); - } else { - $this->stdErr->writeln(sprintf('Downloading files from the remote mount <info>%s</info> to <info>%s</info>', $mountPathAbsolute, $localPath)); - } - $params = ['rsync', '--archive', '--compress', '--human-readable']; if ($this->stdErr->isVeryVerbose()) { @@ -153,9 +91,16 @@ $params[] = $localPath; } - if ($delete) { + if (!empty($options['delete'])) { $params[] = '--delete'; } + foreach (['exclude', 'include'] as $option) { + if (!empty($options[$option])) { + foreach ($options[$option] as $value) { + $params[] = '--' . $option . '=' . $value; + } + } + } $start = microtime(true); $shell->execute($params, null, true, false, [], null); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/src/Command/Mount/MountDownloadCommand.php new/platformsh-cli-3.23.0/src/Command/Mount/MountDownloadCommand.php --- old/platformsh-cli-3.22.3/src/Command/Mount/MountDownloadCommand.php 2017-11-16 11:12:57.000000000 +0100 +++ new/platformsh-cli-3.23.0/src/Command/Mount/MountDownloadCommand.php 2017-11-24 17:31:28.000000000 +0100 @@ -22,6 +22,8 @@ ->addOption('mount', 'm', InputOption::VALUE_REQUIRED, 'The mount (as an app-relative path)') ->addOption('target', null, InputOption::VALUE_REQUIRED, 'The directory to which files will be downloaded') ->addOption('delete', null, InputOption::VALUE_NONE, 'Whether to delete extraneous files in the target directory') + ->addOption('exclude', null, InputOption::VALUE_IS_ARRAY|InputOption::VALUE_REQUIRED, 'File(s) to exclude from the download (pattern)') + ->addOption('include', null, InputOption::VALUE_IS_ARRAY|InputOption::VALUE_REQUIRED, 'File(s) to include in the download (pattern)') ->addOption('refresh', null, InputOption::VALUE_NONE, 'Whether to refresh the cache'); $this->addProjectOption(); $this->addEnvironmentOption(); @@ -46,6 +48,9 @@ return 1; } + /** @var \Platformsh\Cli\Service\Mount $mountService */ + $mountService = $this->getService('mount'); + $mounts = $mountService->normalizeMounts($appConfig['mounts']); /** @var \Platformsh\Cli\Service\QuestionHelper $questionHelper */ $questionHelper = $this->getService('question_helper'); @@ -53,10 +58,10 @@ $fs = $this->getService('fs'); if ($input->getOption('mount')) { - $mountPath = $this->validateMountPath($input->getOption('mount'), $appConfig['mounts']); + $mountPath = $mountService->validateMountPath($input->getOption('mount'), $mounts); } elseif ($input->isInteractive()) { $mountPath = $questionHelper->choose( - $this->getMountsAsOptions($appConfig['mounts']), + $this->getMountsAsOptions($mounts), 'Enter a number to choose a mount to download from:' ); } else { @@ -70,9 +75,10 @@ if ($input->getOption('target')) { $target = $input->getOption('target'); } elseif ($projectRoot = $this->getProjectRoot()) { - if ($sharedPath = $this->getSharedPath($mountPath, $appConfig['mounts'])) { - if (file_exists($projectRoot . '/' . $this->config()->get('local.shared_dir') . '/' . $sharedPath)) { - $defaultTarget = $projectRoot . '/' . $this->config()->get('local.shared_dir') . '/' . $sharedPath; + $sharedMounts = $mountService->getSharedFileMounts($appConfig); + if (isset($sharedMounts[$mountPath])) { + if (file_exists($projectRoot . '/' . $this->config()->get('local.shared_dir') . '/' . $sharedMounts[$mountPath])) { + $defaultTarget = $projectRoot . '/' . $this->config()->get('local.shared_dir') . '/' . $sharedMounts[$mountPath]; } } @@ -107,13 +113,21 @@ $this->validateDirectory($target, true); - $confirmText = "\nThis will <options=bold>add, replace, and delete</> files in the local directory '<comment>" . $fs->formatPathForDisplay($target) . "</comment>'." - . "\n\nAre you sure you want to continue?"; + $confirmText = sprintf( + "\nDownloading files from the remote mount <comment>%s</comment> to <comment>%s</comment>" + . "\n\nAre you sure you want to continue?", + $mountPath, + $fs->formatPathForDisplay($target) + ); if (!$questionHelper->confirm($confirmText)) { return 1; } - $this->runSync($sshUrl, $mountPath, $target, false, (bool) $input->getOption('delete')); + $this->runSync($sshUrl, $mountPath, $target, false, [ + 'delete' => $input->getOption('delete'), + 'exclude' => $input->getOption('exclude'), + 'include' => $input->getOption('include'), + ]); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/src/Command/Mount/MountListCommand.php new/platformsh-cli-3.23.0/src/Command/Mount/MountListCommand.php --- old/platformsh-cli-3.22.3/src/Command/Mount/MountListCommand.php 2017-11-16 11:12:57.000000000 +0100 +++ new/platformsh-cli-3.23.0/src/Command/Mount/MountListCommand.php 2017-11-24 17:31:28.000000000 +0100 @@ -39,25 +39,27 @@ $appConfig = $this->getAppConfig($sshUrl, (bool) $input->getOption('refresh')); - $mounts = $appConfig['mounts']; - if (empty($mounts)) { + if (empty($appConfig['mounts'])) { $this->stdErr->writeln(sprintf('The app "%s" doesn\'t define any mounts.', $appConfig['name'])); - return 0; + return 1; } + /** @var \Platformsh\Cli\Service\Mount $mountService */ + $mountService = $this->getService('mount'); + $mounts = $mountService->normalizeMounts($appConfig['mounts']); if ($input->getOption('paths')) { - foreach (array_keys($mounts) as $path) { - $output->writeln($this->normalizeMountPath($path)); - } + $output->writeln(array_keys($mounts)); return 0; } - $header = ['Path', 'Definition']; + $header = ['Mount path', 'Definition']; $rows = []; + /** @var \Platformsh\Cli\Service\PropertyFormatter $formatter */ + $formatter = $this->getService('property_formatter'); foreach ($mounts as $path => $definition) { - $rows[] = [$this->normalizeMountPath($path), $definition]; + $rows[] = [$path, $formatter->format($definition)]; } /** @var \Platformsh\Cli\Service\Table $table */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/src/Command/Mount/MountUploadCommand.php new/platformsh-cli-3.23.0/src/Command/Mount/MountUploadCommand.php --- old/platformsh-cli-3.22.3/src/Command/Mount/MountUploadCommand.php 2017-11-16 11:12:57.000000000 +0100 +++ new/platformsh-cli-3.23.0/src/Command/Mount/MountUploadCommand.php 2017-11-24 17:31:28.000000000 +0100 @@ -22,6 +22,8 @@ ->addOption('source', null, InputOption::VALUE_REQUIRED, 'A directory containing files to upload') ->addOption('mount', 'm', InputOption::VALUE_REQUIRED, 'The mount (as an app-relative path)') ->addOption('delete', null, InputOption::VALUE_NONE, 'Whether to delete extraneous files in the mount') + ->addOption('exclude', null, InputOption::VALUE_IS_ARRAY|InputOption::VALUE_REQUIRED, 'File(s) to exclude from the upload (pattern)') + ->addOption('include', null, InputOption::VALUE_IS_ARRAY|InputOption::VALUE_REQUIRED, 'File(s) to include in the upload (pattern)') ->addOption('refresh', null, InputOption::VALUE_NONE, 'Whether to refresh the cache'); $this->addProjectOption(); $this->addEnvironmentOption(); @@ -46,6 +48,9 @@ return 1; } + /** @var \Platformsh\Cli\Service\Mount $mountService */ + $mountService = $this->getService('mount'); + $mounts = $mountService->normalizeMounts($appConfig['mounts']); /** @var \Platformsh\Cli\Service\QuestionHelper $questionHelper */ $questionHelper = $this->getService('question_helper'); @@ -53,10 +58,10 @@ $fs = $this->getService('fs'); if ($input->getOption('mount')) { - $mountPath = $this->validateMountPath($input->getOption('mount'), $appConfig['mounts']); + $mountPath = $mountService->validateMountPath($input->getOption('mount'), $mounts); } elseif ($input->isInteractive()) { $mountPath = $questionHelper->choose( - $this->getMountsAsOptions($appConfig['mounts']), + $this->getMountsAsOptions($mounts), 'Enter a number to choose a mount to upload to:' ); } else { @@ -70,9 +75,10 @@ if ($input->getOption('source')) { $source = $input->getOption('source'); } elseif ($projectRoot = $this->getProjectRoot()) { - if ($sharedPath = $this->getSharedPath($mountPath, $appConfig['mounts'])) { - if (file_exists($projectRoot . '/' . $this->config()->get('local.shared_dir') . '/' . $sharedPath)) { - $defaultSource = $projectRoot . '/' . $this->config()->get('local.shared_dir') . '/' . $sharedPath; + $sharedMounts = $mountService->getSharedFileMounts($appConfig); + if (isset($sharedMounts[$mountPath])) { + if (file_exists($projectRoot . '/' . $this->config()->get('local.shared_dir') . '/' . $sharedMounts[$mountPath])) { + $defaultSource = $projectRoot . '/' . $this->config()->get('local.shared_dir') . '/' . $sharedMounts[$mountPath]; } } @@ -107,14 +113,21 @@ $this->validateDirectory($source); - $confirmText = "\nThis will <options=bold>add, replace, and delete</> files in the remote mount '<info>$mountPath</info>'." - . "\n\nAre you sure you want to continue?"; + $confirmText = sprintf( + "\nUploading files from <comment>%s</comment> to the remote mount <comment>%s</comment>" + . "\n\nAre you sure you want to continue?", + $fs->formatPathForDisplay($source), + $mountPath + ); if (!$questionHelper->confirm($confirmText)) { return 1; } - $this->runSync($sshUrl, $mountPath, $source, true, (bool) $input->getOption('delete')); - + $this->runSync($sshUrl, $mountPath, $source, true, [ + 'delete' => $input->getOption('delete'), + 'exclude' => $input->getOption('exclude'), + 'include' => $input->getOption('include'), + ]); return 0; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/src/Command/Project/ProjectGetCommand.php new/platformsh-cli-3.23.0/src/Command/Project/ProjectGetCommand.php --- old/platformsh-cli-3.22.3/src/Command/Project/ProjectGetCommand.php 2017-11-16 11:12:57.000000000 +0100 +++ new/platformsh-cli-3.23.0/src/Command/Project/ProjectGetCommand.php 2017-11-24 17:31:28.000000000 +0100 @@ -202,7 +202,9 @@ throw new InvalidArgumentException('No project specified'); } } else { - $result = $this->parseProjectId($projectId); + /** @var \Platformsh\Cli\Service\Identifier $identifier */ + $identifier = $this->getService('identifier'); + $result = $identifier->identify($projectId); $projectId = $result['projectId']; $host = $host ?: $result['host']; $environmentId = $environmentId ?: $result['environmentId']; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/src/Command/Project/ProjectSetRemoteCommand.php new/platformsh-cli-3.23.0/src/Command/Project/ProjectSetRemoteCommand.php --- old/platformsh-cli-3.22.3/src/Command/Project/ProjectSetRemoteCommand.php 2017-11-16 11:12:57.000000000 +0100 +++ new/platformsh-cli-3.23.0/src/Command/Project/ProjectSetRemoteCommand.php 2017-11-24 17:31:28.000000000 +0100 @@ -20,8 +20,12 @@ protected function execute(InputInterface $input, OutputInterface $output) { $projectId = $input->getArgument('project'); - $result = $this->parseProjectId($projectId); - $project = $this->selectProject($result['projectId'] ?: $projectId); + + /** @var \Platformsh\Cli\Service\Identifier $identifier */ + $identifier = $this->getService('identifier'); + $result = $identifier->identify($projectId); + + $project = $this->selectProject($result['projectId']); /** @var \Platformsh\Cli\Service\Git $git */ $git = $this->getService('git'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/src/Local/LocalApplication.php new/platformsh-cli-3.23.0/src/Local/LocalApplication.php --- old/platformsh-cli-3.22.3/src/Local/LocalApplication.php 2017-11-16 11:12:57.000000000 +0100 +++ new/platformsh-cli-3.23.0/src/Local/LocalApplication.php 2017-11-24 17:31:28.000000000 +0100 @@ -4,6 +4,7 @@ use Platformsh\Cli\Service\Config; use Platformsh\Cli\Exception\InvalidConfigException; use Platformsh\Cli\Local\BuildFlavor\BuildFlavorInterface; +use Platformsh\Cli\Service\Mount; use Symfony\Component\Finder\Finder; use Symfony\Component\Yaml\Exception\ParseException; use Symfony\Component\Yaml\Parser; @@ -15,6 +16,7 @@ protected $config; protected $sourceDir; protected $cliConfig; + protected $mount; /** * @param string $appRoot @@ -29,6 +31,7 @@ $this->cliConfig = $cliConfig ?: new Config(); $this->appRoot = $appRoot; $this->sourceDir = $sourceDir ?: $appRoot; + $this->mount = new Mount(); } /** @@ -144,22 +147,10 @@ * Get a list of shared file mounts configured for the app. * * @return array - * An array of shared file mount paths, keyed by the path in the app. - * Leading and trailing slashes are stripped. */ public function getSharedFileMounts() { - $sharedFileMounts = []; - $appConfig = $this->getConfig(); - if (!empty($appConfig['mounts'])) { - foreach ($appConfig['mounts'] as $path => $uri) { - if (preg_match('#^shared:files/(.+)$#', $uri, $matches)) { - $sharedFileMounts[trim($path, '/')] = trim($matches[1], '/'); - } - } - } - - return $sharedFileMounts; + return $this->mount->getSharedFileMounts($this->getConfig()); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/src/Service/Api.php new/platformsh-cli-3.23.0/src/Service/Api.php --- old/platformsh-cli-3.22.3/src/Service/Api.php 2017-11-16 11:12:57.000000000 +0100 +++ new/platformsh-cli-3.23.0/src/Service/Api.php 2017-11-24 17:31:28.000000000 +0100 @@ -3,6 +3,7 @@ namespace Platformsh\Cli\Service; use Doctrine\Common\Cache\CacheProvider; +use GuzzleHttp\ClientInterface; use Platformsh\Cli\Event\EnvironmentsChangedEvent; use Platformsh\Cli\Util\NestedArrayUtil; use Platformsh\Client\Connection\Connector; @@ -229,7 +230,7 @@ $this->cache->save($cacheKey, $cachedProjects, $this->config->get('api.projects_ttl')); } else { - $guzzleClient = $this->getClient()->getConnector()->getClient(); + $guzzleClient = $this->getHttpClient(); foreach ((array) $cached as $id => $data) { $projects[$id] = new Project($data, $data['_endpoint'], $guzzleClient); } @@ -273,7 +274,7 @@ $this->cache->save($cacheKey, $toCache, $this->config->get('api.projects_ttl')); } } else { - $guzzleClient = $this->getClient()->getConnector()->getClient(); + $guzzleClient = $this->getHttpClient(); $baseUrl = $cached['_endpoint']; unset($cached['_endpoint']); $project = new Project($cached, $baseUrl, $guzzleClient); @@ -325,7 +326,7 @@ } else { $environments = []; $endpoint = $project->getUri(); - $guzzleClient = $this->getClient()->getConnector()->getClient(); + $guzzleClient = $this->getHttpClient(); foreach ((array) $cached as $id => $data) { $environments[$id] = new Environment($data, $endpoint, $guzzleClient, true); } @@ -635,4 +636,14 @@ return $result; } + + /** + * Get the HTTP client. + * + * @return ClientInterface + */ + public function getHttpClient() + { + return $this->getClient(false)->getConnector()->getClient(); + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/src/Service/Identifier.php new/platformsh-cli-3.23.0/src/Service/Identifier.php --- old/platformsh-cli-3.22.3/src/Service/Identifier.php 1970-01-01 01:00:00.000000000 +0100 +++ new/platformsh-cli-3.23.0/src/Service/Identifier.php 2017-11-24 17:31:28.000000000 +0100 @@ -0,0 +1,177 @@ +<?php +/** + * @file + * Finds the correct project and environment for a given URL/string. + */ + +namespace Platformsh\Cli\Service; + +use Doctrine\Common\Cache\Cache; +use GuzzleHttp\Exception\RequestException; +use Symfony\Component\Console\Exception\InvalidArgumentException; +use Symfony\Component\Console\Output\ConsoleOutput; +use Symfony\Component\Console\Output\NullOutput; +use Symfony\Component\Console\Output\OutputInterface; + +class Identifier +{ + private $config; + private $api; + private $stdErr; + private $cache; + + /** + * Constructor. + * + * @param \Platformsh\Cli\Service\Config|null $config + * @param \Platformsh\Cli\Service\Api|null $api + * @param \Symfony\Component\Console\Output\OutputInterface|null $output + * @param \Doctrine\Common\Cache\Cache|null $cache + */ + public function __construct(Config $config = null, Api $api = null, OutputInterface $output = null, Cache $cache = null) + { + $this->config = $config ?: new Config(); + $this->api = $api ?: new Api(); + $output = $output ?: new NullOutput(); + $this->stdErr = $output instanceof ConsoleOutput ? $output->getErrorOutput() : $output; + $this->cache = $cache; + } + + /** + * Identify a project from an ID or URL. + * + * @param string $url + * + * @return array + * An array containing keys 'projectId', 'environmentId', 'host', and + * 'appId'. At least the 'projectId' will be populated. + */ + public function identify($url) + { + $result = $this->parseProjectId($url); + if (empty($result['projectId']) && strpos($url, '.') !== false) { + $result = $this->identifyFromHeaders($url); + } + if (empty($result['projectId'])) { + throw new InvalidArgumentException('Failed to identify project ID from URL: <error>' . $url . '</error>'); + } + + return $result + ['environmentId' => null, 'host' => null, 'appId' => null]; + } + + /** + * Parse the project ID and possibly other details from a provided URL. + * + * @param string $url + * A web UI, API, or public URL of the project. + * + * @return array + */ + private function parseProjectId($url) + { + $result = []; + + // If it's a plain alphanumeric string, then it's an ID already. + if (!preg_match('/\W/', $url)) { + $result['projectId'] = $url; + + return $result; + } + + $urlParts = parse_url($url); + if ($urlParts === false || empty($urlParts['host'])) { + return $result; + } + + $this->debug('Parsing URL to determine project ID: ' . $url); + + $host = $urlParts['host']; + $path = isset($urlParts['path']) ? $urlParts['path'] : ''; + $fragment = isset($urlParts['fragment']) ? $urlParts['fragment'] : ''; + + $site_domains_pattern = '(' . implode('|', array_map('preg_quote', $this->config->get('detection.site_domains'))) . ')'; + $site_pattern = '/\-\w+\.[a-z]{2}(\-[0-9])?\.' . $site_domains_pattern . '$/'; + if (strpos($path, '/projects/') !== false || strpos($fragment, '/projects/') !== false) { + $result['host'] = $host; + $result['projectId'] = basename(preg_replace('#/projects(/\w+)/?.*$#', '$1', $url)); + if (preg_match('#/environments(/[^/]+)/?.*$#', $url, $matches)) { + $result['environmentId'] = rawurldecode(basename($matches[1])); + } + } elseif (preg_match($site_pattern, $host)) { + list($env_project_app,) = explode('.', $host, 2); + if (($tripleDashPos = strrpos($env_project_app, '---')) !== false) { + $env_project_app = substr($env_project_app, $tripleDashPos + 3); + } + if (($doubleDashPos = strrpos($env_project_app, '--')) !== false) { + $env_project = substr($env_project_app, 0, $doubleDashPos); + $result['appId'] = substr($env_project_app, $doubleDashPos + 2); + } else { + $env_project = $env_project_app; + } + if (($dashPos = strrpos($env_project, '-')) !== false) { + $result['projectId'] = substr($env_project, $dashPos + 1); + $result['environmentId'] = substr($env_project, 0, $dashPos); + } + } + + return $result; + } + + /** + * Identify a project and environment from a URL's response headers. + * + * @param string $url + * + * @return array + */ + private function identifyFromHeaders($url) + { + if (!strpos($url, '.')) { + throw new \InvalidArgumentException('Invalid URL: ' . $url); + } + if (strpos($url, '//') === false) { + $url = 'https://' . $url; + } + $result = ['projectId' => null, 'environmentId' => null]; + $cluster = $this->getClusterHeader($url); + if (!empty($cluster)) { + $this->debug('Identified project cluster: ' . $cluster); + list($result['projectId'], $result['environmentId']) = explode('-', $cluster, 2); + } + + return $result; + } + + /** + * Get a project cluster from its URL. + * + * @param string $url + * + * @return string + */ + private function getClusterHeader($url) + { + $cacheKey = 'project-cluster:' . $url; + $cluster = $this->cache ? $this->cache->fetch($cacheKey) : false; + if ($cluster === false) { + $this->debug('Making a HEAD request to identify project from URL: ' . $url); + try { + $response = $this->api->getHttpClient()->head($url, ['auth' => false]); + $cluster = $response->getHeader($this->config->get('service.header_prefix') . '-cluster'); + $this->cache->save($cacheKey, $cluster, 86400); + } catch (RequestException $e) { + $this->debug($e->getMessage()); + } + } + + return $cluster; + } + + /** + * @param string $message + */ + private function debug($message) + { + $this->stdErr->writeln('<options=reverse>DEBUG</> ' . $message, OutputInterface::VERBOSITY_DEBUG); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.22.3/src/Service/Mount.php new/platformsh-cli-3.23.0/src/Service/Mount.php --- old/platformsh-cli-3.22.3/src/Service/Mount.php 1970-01-01 01:00:00.000000000 +0100 +++ new/platformsh-cli-3.23.0/src/Service/Mount.php 2017-11-24 17:31:28.000000000 +0100 @@ -0,0 +1,110 @@ +<?php +/** + * @file + * Service to help with mounts. + */ + +namespace Platformsh\Cli\Service; + +class Mount +{ + /** + * Get a list of shared file mounts configured for an app. + * + * @param array $appConfig The app configuration. + * + * @return array + * An array of shared file paths, keyed by the mount path. Leading and + * trailing slashes are stripped. An empty shared path defaults to + * 'files'. + */ + public function getSharedFileMounts(array $appConfig) + { + $sharedFileMounts = []; + if (!empty($appConfig['mounts'])) { + foreach ($this->normalizeMounts($appConfig['mounts']) as $path => $definition) { + if (isset($definition['source_path'])) { + $sharedFileMounts[$path] = $definition['source_path'] ?: 'files'; + } + } + } + + return $sharedFileMounts; + } + + /** + * Normalize a list of mounts. + * + * @param array $mounts + * + * @return array + */ + public function normalizeMounts(array $mounts) + { + $normalized = []; + foreach ($mounts as $path => $definition) { + $normalized[$this->normalizeRelativePath($path)] = $this->normalizeDefinition($definition); + } + + return $normalized; + } + + /** + * Validate and normalize a path to a mount. + * + * @param string $inputPath + * @param array $mounts + * + * @return string + * The normalized mount path. + */ + public function validateMountPath($inputPath, array $mounts) + { + $normalized = $this->normalizeRelativePath($inputPath); + if (isset($mounts[$normalized])) { + return $normalized; + } + + throw new \InvalidArgumentException(sprintf('Mount not found: <error>%s</error>', $inputPath)); + } + + /** + * Normalize a path to a mount. + * + * @param string $path + * + * @return string + */ + private function normalizeRelativePath($path) + { + return trim(trim($path), '/'); + } + + /** + * Normalize a mount definition. + * + * @param array|string $definition + * + * @return array + * An array containing at least 'source', and probably 'source_path'. + */ + private function normalizeDefinition($definition) + { + if (!is_array($definition)) { + if (!is_string($definition) || strpos($definition, 'shared:files') === false) { + throw new \RuntimeException('Failed to parse mount definition: ' . json_encode($definition)); + } + $definition = [ + 'source' => 'local', + 'source_path' => str_replace('shared:files', '', $definition), + ]; + } elseif (!isset($definition['source'])) { + throw new \InvalidArgumentException('Invalid mount definition: ' . json_encode($definition)); + } + if (isset($definition['source_path'])) { + $definition['source_path'] = $this->normalizeRelativePath($definition['source_path']); + } + + return $definition; + } +} ++++++ platformsh-cli-vendor.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/autoload.php new/vendor/autoload.php --- old/vendor/autoload.php 2017-11-17 03:10:21.750250969 +0100 +++ new/vendor/autoload.php 2017-11-29 04:34:08.486671140 +0100 @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit9af1103173d4746089e91b605155fbbc::getLoader(); +return ComposerAutoloaderInite17779ccbc2cb04617d6385149e1e678::getLoader(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/composer/autoload_real.php new/vendor/composer/autoload_real.php --- old/vendor/composer/autoload_real.php 2017-11-17 03:10:21.750250969 +0100 +++ new/vendor/composer/autoload_real.php 2017-11-29 04:34:08.486671140 +0100 @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit9af1103173d4746089e91b605155fbbc +class ComposerAutoloaderInite17779ccbc2cb04617d6385149e1e678 { private static $loader; @@ -19,15 +19,15 @@ return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit9af1103173d4746089e91b605155fbbc', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInite17779ccbc2cb04617d6385149e1e678', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit9af1103173d4746089e91b605155fbbc', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInite17779ccbc2cb04617d6385149e1e678', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit9af1103173d4746089e91b605155fbbc::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInite17779ccbc2cb04617d6385149e1e678::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit9af1103173d4746089e91b605155fbbc::$files; + $includeFiles = Composer\Autoload\ComposerStaticInite17779ccbc2cb04617d6385149e1e678::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire9af1103173d4746089e91b605155fbbc($fileIdentifier, $file); + composerRequiree17779ccbc2cb04617d6385149e1e678($fileIdentifier, $file); } return $loader; } } -function composerRequire9af1103173d4746089e91b605155fbbc($fileIdentifier, $file) +function composerRequiree17779ccbc2cb04617d6385149e1e678($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/composer/autoload_static.php new/vendor/composer/autoload_static.php --- old/vendor/composer/autoload_static.php 2017-11-17 03:10:21.750250969 +0100 +++ new/vendor/composer/autoload_static.php 2017-11-29 04:34:08.486671140 +0100 @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit9af1103173d4746089e91b605155fbbc +class ComposerStaticInite17779ccbc2cb04617d6385149e1e678 { public static $files = array ( '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', @@ -188,9 +188,9 @@ public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit9af1103173d4746089e91b605155fbbc::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit9af1103173d4746089e91b605155fbbc::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit9af1103173d4746089e91b605155fbbc::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInite17779ccbc2cb04617d6385149e1e678::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInite17779ccbc2cb04617d6385149e1e678::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInite17779ccbc2cb04617d6385149e1e678::$classMap; }, null, ClassLoader::class); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/composer/installed.json new/vendor/composer/installed.json --- old/vendor/composer/installed.json 2017-11-17 03:10:21.166245724 +0100 +++ new/vendor/composer/installed.json 2017-11-29 04:34:07.866665802 +0100 @@ -657,17 +657,17 @@ }, { "name": "platformsh/client", - "version": "v0.12.0", - "version_normalized": "0.12.0.0", + "version": "v0.12.1", + "version_normalized": "0.12.1.0", "source": { "type": "git", "url": "https://github.com/platformsh/platformsh-client-php.git", - "reference": "e5ce468ddc35d8a95fff79579a17b076cd5831c4" + "reference": "945ba687f110c3c74e8c250b1b4afd2d03062c7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/platformsh/platformsh-client-php/zipball/e5ce4…", - "reference": "e5ce468ddc35d8a95fff79579a17b076cd5831c4", + "url": "https://api.github.com/repos/platformsh/platformsh-client-php/zipball/945ba…", + "reference": "945ba687f110c3c74e8c250b1b4afd2d03062c7c", "shasum": "" }, "require": { @@ -680,7 +680,7 @@ "require-dev": { "phpunit/phpunit": "~4.5" }, - "time": "2017-09-20T08:28:37+00:00", + "time": "2017-11-16T12:15:47+00:00", "type": "library", "extra": { "patches": { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/platformsh/client/src/Model/Integration.php new/vendor/platformsh/client/src/Model/Integration.php --- old/vendor/platformsh/client/src/Model/Integration.php 2017-09-20 10:28:37.000000000 +0200 +++ new/vendor/platformsh/client/src/Model/Integration.php 2017-11-16 13:15:47.000000000 +0100 @@ -19,6 +19,7 @@ 'bitbucket', 'hipchat', 'github', + 'gitlab', 'webhook', 'health.email', 'health.pagerduty',

1 0

commit xsettingsd for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package xsettingsd for openSUSE:Factory checked in at 2017-11-30 12:45:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xsettingsd (Old) and /work/SRC/openSUSE:Factory/.xsettingsd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xsettingsd" Thu Nov 30 12:45:26 2017 rev:9 rq:546325 version:0.0+git20171105 Changes: -------- --- /work/SRC/openSUSE:Factory/xsettingsd/xsettingsd.changes 2017-11-24 10:54:13.776813058 +0100 +++ /work/SRC/openSUSE:Factory/.xsettingsd.new/xsettingsd.changes 2017-11-30 12:45:27.929757127 +0100 @@ -1,0 +2,5 @@ +Tue Nov 28 18:33:43 UTC 2017 - crrodriguez(a)opensuse.org + +- Buildrequire pkgconfig(x11) not the whole of xorg-x11-devel. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsettingsd.spec ++++++ --- /var/tmp/diff_new_pack.KnlH9i/_old 2017-11-30 12:45:29.337705944 +0100 +++ /var/tmp/diff_new_pack.KnlH9i/_new 2017-11-30 12:45:29.341705798 +0100 @@ -27,8 +27,8 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: scons -BuildRequires: xorg-x11-devel BuildRequires: xz +BuildRequires: pkgconfig(x11) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description

1 0