April 2016 - openSUSE Commits - openSUSE Mailing Lists

commit abcde for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package abcde for openSUSE:Factory checked in at 2016-04-30 23:31:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abcde (Old) and /work/SRC/openSUSE:Factory/.abcde.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "abcde" Changes: -------- --- /work/SRC/openSUSE:Factory/abcde/abcde.changes 2016-01-05 21:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.abcde.new/abcde.changes 2016-04-30 23:31:02.000000000 +0200 @@ -1,0 +2,29 @@ +Mon Apr 25 11:43:45 UTC 2016 - p.drouand(a)gmail.com + +- Update to version 2.7.2 + * When using musicbrainz, don't assume that there will be release + events attached to a particular CD release. Bug fix for the addition + of year information support in 2.7.1. + * Support for output to the Matroska container (mka). Encoder + is FFmpeg (or avconv). Typical conf file syntax would be: + + MKAENCODERSYNTAX=ffmpeg + FFMPEG=ffmpeg + FFMPEGENCOPTS="-c:a ac3 -b:a 448k" + OUTPUTTYPE="mka" + * Add id3tag mp3 tagger as this is the tagger available to + OpenBSD users. + * Allow for cddb response 500. This closes Issue 26: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=26 + * Fix for 'expansion of $REDIR' bug on MacOSX. This closes Issue 22: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=22 + * Makefile adjusted to allow the sample abcde.conf file to be + installed by default to /etc rather than $(prefix)/etc. + https://bugs.archlinux.org/task/46671 + * Allow getalbumart to correctly place cover image when single + track is selected. This closes Issue 25: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=25 +- Update abcde-quote.patch +- Set BuildArch as noarch; the package doesn't contain any binary + +------------------------------------------------------------------- Old: ---- abcde-2.7.1.tar.gz New: ---- abcde-2.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abcde.spec ++++++ --- /var/tmp/diff_new_pack.g799XN/_old 2016-04-30 23:31:03.000000000 +0200 +++ /var/tmp/diff_new_pack.g799XN/_new 2016-04-30 23:31:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: abcde -Version: 2.7.1 +Version: 2.7.2 Release: 0 Summary: A Better CD Encoder License: GPL-2.0+ @@ -26,7 +26,6 @@ Source0: http://abcde.einval.com/download/%{name}-%{version}.tar.gz # bug 419800 Patch0: abcde-quote.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: cd-discid Requires: cdparanoia Requires: wget @@ -35,6 +34,7 @@ Recommends: vorbis-tools # lame is often used for mp3 encoding Suggests: lame +BuildArch: noarch %description A front-end program to cdparanoia, wget, cd-discid, id3, and your ++++++ abcde-2.7.1.tar.gz -> abcde-2.7.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/FAQ new/abcde-2.7.2/FAQ --- old/abcde-2.7.1/FAQ 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/FAQ 2016-04-06 10:47:56.000000000 +0200 @@ -451,7 +451,18 @@ OUTPUTTYPE="mp2" So currently FFmpeg supports: alac, wavpack and mp2. FFmpeg native aac support will - be added when it comes out of 'experimental'. + be added when it comes out of 'experimental'. FFmpeg is also used as the default + encoder for the Matroska or mka container. A typical example, using the FFmpeg + native ac3 encoder, is: + + MKAENCODERSYNTAX=ffmpeg + FFMPEG=ffmpeg + FFMPEGENCOPTS="-c:a ac3 -b:a 448k" + OUTPUTTYPE="mka" + + Other suitable codecs for this usage are Vorbis, MP2, MP3, LC-AAC, HE-AAC, WMAv1, + WMAv2, eAC3 and Opus. There is much more to come in the future for abcde and FFmpeg! + 5. USEPIPES ======== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/Makefile new/abcde-2.7.2/Makefile --- old/abcde-2.7.1/Makefile 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/Makefile 2016-04-06 10:47:56.000000000 +0200 @@ -1,10 +1,10 @@ -abcde_version = abcde-2.7.1 +abcde_version = abcde-2.7.2 INSTALL = /usr/bin/install -c prefix = /usr/local exec_prefix = $(prefix) bindir = $(exec_prefix)/bin -sysconfdir = $(prefix)/etc +sysconfdir = /etc datarootdir = $(prefix)/share docdir = $(datarootdir)/doc/$(abcde_version) mandir = $(datarootdir)/man diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/README new/abcde-2.7.2/README --- old/abcde-2.7.1/README 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/README 2016-04-06 10:47:56.000000000 +0200 @@ -22,6 +22,12 @@ MAJOR CHANGES ============= +Changes in 2.7.2 +* Support for output to the Matroska container (mka). +* Add id3tag mp3 tagger as this is the tagger available to + OpenBSD users. +* Several bug fixes. See the changelog for more details. + Changes in 2.7.1 * Rewrite and improvement of the abcde Makefile. * Support added for True Audio encoding. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/abcde new/abcde-2.7.2/abcde --- old/abcde-2.7.1/abcde 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/abcde 2016-04-06 10:47:56.000000000 +0200 @@ -11,7 +11,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -VERSION='2.7.1' +VERSION='2.7.2' usage () { @@ -47,7 +47,7 @@ echo "-n No lookup. Don't query CDDB, just create and use template" echo "-N Noninteractive. Never prompt for anything" echo "-o <type1[,type2]...>" -echo " Output file type(s) (vorbis,mp3,flac,spx,mpc,wav,m4a,opus,wv,ape,mp2,tta). Defaults to vorbis" +echo " Output file type(s) (vorbis,mp3,flac,spx,mpc,wav,m4a,opus,mka,wv,ape,mp2,tta). Defaults to vorbis" echo "-p Pad track numbers with 0's (if less than 10 tracks)" echo "-P Use UNIX pipes to read+encode without wav files" echo "-r <host1[,host2]...>" @@ -839,6 +839,16 @@ ${TPE2:+--TPE2 "$TPE2"} \ "$ABCDETEMPDIR/track$1.$OUTPUT" ;; + id3tag) + # FIXME # track numbers in mp3 come with 1/10, so we cannot + # happily substitute them with $TRACKNUM + run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \ + $TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \ + -A "$DALBUM" -a "$TRACKARTIST" -s "$TRACKNAME" \ + -y "$CDYEAR" -g "$GENREID" \ + -t "${TRACKNUM:-$1}" ${TRACKNUM:+-T "$TRACKS"} \ + "$ABCDETEMPDIR/track$1.$OUTPUT" + ;; eyed3*) # FIXME # track numbers in mp3 come with 1/10, so we cannot # happily substitute them with $TRACKNUM @@ -926,6 +936,9 @@ opus) run_command tagtrack-$OUTPUT-$1 true ;; + mka) + run_command tagtrack-$OUTPUT-$1 true + ;; flac) ( echo ARTIST="$TRACKARTIST" @@ -1096,6 +1109,9 @@ opus) TEMPARG="PIPE_$OPUSENCODERSYNTAX" ;; + mka) + TEMPARG="PIPE_$MKAENCODERSYNTAX" + ;; flac) TEMPARG="PIPE_$FLACENCODERSYNTAX" ;; @@ -1133,6 +1149,9 @@ opus) OUTPUT=$OPUSOUTPUTCONTAINER ;; + mka) + OUTPUT=$MKAOUTPUTCONTAINER + ;; flac) OUTPUT=$FLACOUTPUTCONTAINER ;; @@ -1208,6 +1227,19 @@ ;; esac ;; + mka) + case "$MKAENCODERSYNTAX" in + ffmpeg) + if [ "$DOTAG" = "y" ]; then + $RUN_COMMAND nice $EFFECTIVE_NICE $MKAENCODER -i "$IN" $MKAENCODEROPTS -metadata artist="$TRACKARTIST" \ + -metadata album="$DALBUM" -metadata title="$TRACKNAME" -metadata track=${TRACKNUM:-$1} -metadata date="$CDYEAR" \ + -metadata genre="$CDGENRE" -metadata comment="$COMMENT" "$OUT" + else + $RUN_COMMAND nice $EFFECTIVE_NICE $MKAENCODER -i "$IN" $MKAENCODEROPTS "$OUT" + fi + ;; + esac + ;; flac) case "$2" in %local*%) @@ -1575,6 +1607,9 @@ opus) OUTPUT=$OPUSOUTPUTCONTAINER ;; + mka) + OUTPUT=$MKAOUTPUTCONTAINER + ;; flac) OUTPUT=$FLACOUTPUTCONTAINER ;; @@ -1659,6 +1694,9 @@ opus) OUTPUT=$OPUSOUTPUTCONTAINER ;; + mka) + OUTPUT=$MKAOUTPUTCONTAINER + ;; flac) OUTPUT=$FLACOUTPUTCONTAINER ;; @@ -2261,13 +2299,13 @@ fi echo "---- $(grep DTITLE "${CDDBPARSEFILE}" | cut '-d=' -f2- | tr -d \\r\\n ) ----" if [ X"$SHOWCDDBYEAR" = "Xy" ]; then - PARSEDYEAR=$(grep DYEAR "${CDDBPARSEFILE}" | cut '-d=' -f2-) + PARSEDYEAR=$(grep -a DYEAR "${CDDBPARSEFILE}" | cut '-d=' -f2-) if [ ! X"$PARSEDYEAR" = "X" ]; then echo "Year: $PARSEDYEAR" fi fi if [ X"$SHOWCDDBGENRE" = "Xy" ]; then - PARSEDGENRE=$(grep DGENRE "${CDDBPARSEFILE}" | cut '-d=' -f2-) + PARSEDGENRE=$(grep -a DGENRE "${CDDBPARSEFILE}" | cut '-d=' -f2-) if [ ! X"$PARSEDGENRE" = "X" ]; then echo "Genre: $PARSEDGENRE" fi @@ -2275,7 +2313,7 @@ if [ ! "$ONETRACK" = "y" ]; then for TRACK in $(f_seq_row 1 $TRACKS) do - echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "${CDDBPARSEFILE}" | cut -f2- -d= | tr -d \\r\\n)" + echo $TRACK: "$(grep -a ^TTITLE$(expr $TRACK - 1)= "${CDDBPARSEFILE}" | cut -f2- -d= | tr -d \\r\\n)" done fi } @@ -2456,20 +2494,21 @@ echo "done." >> "$ABCDETEMPDIR/cddbchoices" echo cddb-read-1-complete >> "$ABCDETEMPDIR/status" echo cddb-choice=1 >> "$ABCDETEMPDIR/status" - ATITLE=$(grep -e '^Album title:' "${ABCDETEMPDIR}/cd-text" | cut -c14- ) + ATITLE=$(grep -ae '^Album title:' "${ABCDETEMPDIR}/cd-text" | cut -c14- ) echo "200 none ${ATITLE}" >> "$ABCDETEMPDIR/cddbquery" # List out disc title/author and contents echo ---- ${ATITLE} ---- >> "$ABCDETEMPDIR/cddbchoices" for TRACK in $(f_seq_row 1 $TRACKS) do TRACKM1=$(($TRACK - 1)) - TITLE="$(grep -E ^Track\ +$TRACK: "$ABCDETEMPDIR/cd-text" | tr -d \\r\\n | sed 's~^Track ..: .~~g;'"s~'$~~g")" + TITLE="$(grep -aE ^Track\ +$TRACK: "$ABCDETEMPDIR/cd-text" | tr -d \\r\\n | sed 's~^Track ..: .~~g;'"s~'$~~g")" echo "$TRACK: $TITLE" >> "$ABCDETEMPDIR/cddbchoices" - sed "s~^TTITLE${TRACKM1}=.*~TTITLE${TRACKM1}=${TITLE}~" "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbread.new" - mv -f "$ABCDETEMPDIR/cddbread.new" "$ABCDETEMPDIR/cddbread.1" + sed "s~^TTITLE${TRACKM1}=.*~TTITLE${TRACKM1}=${TITLE}~" "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbread.new" && \ + mv -f "$ABCDETEMPDIR/cddbread.new" "$ABCDETEMPDIR/cddbread.1" done - sed "s~^DTITLE=.*~DTITLE=${ATITLE}~" "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbread.new" - mv -f "$ABCDETEMPDIR/cddbread.new" "$ABCDETEMPDIR/cddbread.1" + sed "s~^DTITLE=.*~DTITLE=${ATITLE}~" "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbread.new" && \ + mv -f "$ABCDETEMPDIR/cddbread.new" "$ABCDETEMPDIR/cddbread.1" + rm -f "$ABCDETEMPDIR/cddbread.new" # In case a sed error occurred echo >> "$ABCDETEMPDIR/cddbchoices" echo "cdtext-readcomplete" >> "$ABCDETEMPDIR/status" } @@ -2669,12 +2708,14 @@ done echo >> "$ABCDETEMPDIR/cddbchoices" ;; - 202|403|409|503) - # No match + 202|403|409|500|503) + # TODO: Explain these error codes a little more accurately: + # http://ftp.freedb.org/pub/freedb/misc/freedb_CDDB_protcoldoc.zip + # No match response: case "$RESPONSECODE" in 202) echo "No CDDB match." >> "$ABCDETEMPDIR/cddbchoices" ;; 403|409) echo "CDDB entry is corrupt, or the handshake failed." >> "$ABCDETEMPDIR/cddbchoices" ;; - 503) echo "CDDB unavailable." >> "$ABCDETEMPDIR/cddbchoices" ;; + 500|503) echo "CDDB unavailable." >> "$ABCDETEMPDIR/cddbchoices" ;; esac $CDDBTOOL template $(cat "$ABCDETEMPDIR/discid") > "$ABCDETEMPDIR/cddbread.0" # List out disc title/author and contents of template @@ -3180,11 +3221,19 @@ for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ) do # put cover in the same place as the album + if [ "$ONETRACK" = "y" ] ; then + if [ "$VARIOUSARTISTS" = "y" ] ; then + ALBUMARTDIR="$(eval echo "$VAONETRACKOUTPUTFORMAT")" + else + ALBUMARTDIR="$(eval echo "$ONETRACKOUTPUTFORMAT")" + fi + else if [ "$VARIOUSARTISTS" = "y" ] ; then ALBUMARTDIR="$(eval echo "$VAOUTPUTFORMAT")" else ALBUMARTDIR="$(eval echo "$OUTPUTFORMAT")" fi + fi FINALALBUMARTDIR="$(dirname "$OUTPUTDIR/$ALBUMARTDIR")" vecho "copying cover to target directory $FINALALBUMARTDIR" >&2 mkdir -p "$FINALALBUMARTDIR" @@ -3231,7 +3280,6 @@ if [ "$USEPIPES" = "y" ]; then TEMPARG="PIPERIPPER_$CDROMREADERSYNTAX" FILEARG="$( eval echo "\$$TEMPARG" )" - REDIR="" PIPE_MESSAGE="and encoding " else WAVDATA="$ABCDETEMPDIR/track$UTRACKNUM.wav" @@ -3244,7 +3292,6 @@ FILEARG="$WAVDATA" ;; esac - REDIR=">&2" fi if [ "$1" = "onetrack" ]; then echo "Grabbing ${PIPE_MESSAGE}tracks $UTRACKNUM - $LASTTRACK as one track ..." >&2 @@ -3264,8 +3311,13 @@ STRIPTRACKNUM=$(expr $UTRACKNUM + 0) nice $READNICE $FLAC -d -f --cue=${READTRACKNUMS:-$STRIPTRACKNUM.1-$(($STRIPTRACKNUM + 1)).0} "$FILEARG" "$CDROM" ;; cdparanoia|libcdio) - nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;; - cdda2wav | icedax) + if [ "$USEPIPES" = "y" ]; then + nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" + else + nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" >&2 + fi + ;; + cdda2wav|icedax) if [ "$OSFLAVOUR" = "OSX" ] ; then # Hei, we have to unmount the device before running anything like cdda2wav/icedax in OSX diskutil unmount ${CDROM#/dev/} @@ -3280,17 +3332,25 @@ CDDA2WAVCDROM="$CDROMID" fi fi - nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;; - dagrab) nice $READNICE $CDROMREADER -d "$CDROM" -f "$FILEARG" -v $UTRACKNUM >&2 ;; + if [ "$USEPIPES" = "y" ]; then + nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" + else + nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" >&2 + fi + ;; + dagrab) + # I cannot get USEPIPES to work with dagrab so just this: + nice $READNICE $CDROMREADER -d "$CDROM" -f "$FILEARG" -v $UTRACKNUM >&2 + ;; pird) if [ "$USEPIPES" = "y" ]; then nice $READNICE $CDROMREADER -j ${READTRACKNUMS:-$UTRACKNUM} "$CDROM" "$FILEARG" else # Write ripped audio data to stdout and redirect to $FILEARG. - # $REDIR can be ignored. Progress is written to stderr by default. + # Progress is written to stderr by default and thus >&2 is not required. nice $READNICE $CDROMREADER -j ${READTRACKNUMS:-$UTRACKNUM} "$CDROM" "$PIPERIPPER_pird" > "$FILEARG" fi - ;; + ;; cddafs) # Find the track's mounted path REALTRACKNUM=$(expr $UTRACKNUM + 0) @@ -3298,11 +3358,21 @@ FILEPATH=$(find "$FILEPATH" | grep "/$REALTRACKNUM "); # If the file exists, copy it if [ -e "$FILEPATH" ] ; then - nice $READNICE $CDROMREADER "$FILEPATH" "$FILEARG" $REDIR + if [ "$USEPIPES" = "y" ]; then + nice $READNICE $CDROMREADER "$FILEPATH" "$FILEARG" + else + nice $READNICE $CDROMREADER "$FILEPATH" "$FILEARG" >&2 + fi else false fi ;; - debug) nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" -w $UTRACKNUM-[:1] "$FILEARG" $REDIR ;; + debug) + if [ "$USEPIPES" = "y" ]; then + nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" -w $UTRACKNUM-[:1] "$FILEARG" + else + nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" -w $UTRACKNUM-[:1] "$FILEARG" >&2 + fi + ;; esac RETURN=$? # If we get some error or we get some missing wav @@ -3448,6 +3518,7 @@ MP3ENCODERSYNTAX=default OGGENCODERSYNTAX=default OPUSENCODERSYNTAX=default +MKAENCODERSYNTAX=default FLACENCODERSYNTAX=default SPEEXENCODERSYNTAX=default MPCENCODERSYNTAX=default @@ -3538,6 +3609,7 @@ ID3V2=id3v2 MID3V2=mid3v2 EYED3=eyeD3 +ID3TAG=id3tag VORBISCOMMENT=vorbiscomment METAFLAC=metaflac NEROAACTAG=neroAacTag @@ -3621,6 +3693,7 @@ FFMPEGENCOPTS= ID3OPTS= +ID3TAGOPTS= EYED3OPTS="" ATOMICPARSLEYOPTS= CDPARANOIAOPTS= @@ -3683,7 +3756,7 @@ # We won't find the eject program in OSX, and doing checkexec will fail further below... unset EJECT elif [ X$(uname) = "XOpenBSD" ] ; then - HTTPGET=wget + HTTPGET=ftp MD5SUM=md5 OSFLAVOUR=OBSD elif [ X$(uname) = "XNetBSD" ] ; then @@ -4115,6 +4188,7 @@ case "$OUTPUT" in vorbis:*|ogg:*) OGGENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; opus:*) OPUSENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; + mka:*) MKAENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; mp3:*) MP3ENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; flac:*) FLACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; spx:*) SPEEXENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; @@ -4154,6 +4228,10 @@ [ "$OPUSENCODERSYNTAX" = "default" ] && OPUSENCODERSYNTAX=opusenc OPUSOUTPUTCONTAINER=opus ;; + mka) + [ "$MKAENCODERSYNTAX" = "default" ] && MKAENCODERSYNTAX=ffmpeg + MKAOUTPUTCONTAINER=mka + ;; mp3) [ "$MP3ENCODERSYNTAX" = "default" ] && MP3ENCODERSYNTAX=lame [ "$DOTAG" = "y" ] && NEEDTAGGER=y @@ -4262,6 +4340,12 @@ OPUSENCODER="$OPUSENC" ;; esac +case "$MKAENCODERSYNTAX" in + ffmpeg) + MKAENCODEROPTS="${MKAENCODEROPTSCLI:-$FFMPEGENCOPTS}" + MKAENCODER="$FFMPEG" + ;; +esac case "$FLACENCODERSYNTAX" in flac) FLACENCODEROPTS="${FLACENCODEROPTSCLI:-$FLACOPTS}" @@ -4407,6 +4491,11 @@ ID3SYNTAX=id3v2 TAGGEROPTS="$ID3V2OPTS" ;; + id3tag) + TAGGER="$ID3TAG" + ID3SYNTAX=id3tag + TAGGEROPTS="$ID3TAGOPTS" + ;; id3v2.4) TAGGER="$EYED3" # Note that eyeD3 is set to tag in utf-16 (below). This causes @@ -4555,6 +4644,8 @@ PIPEENCODERSVARCHECK="PIPE_$OGGENCODERSYNTAX" ;; opus) PIPEENCODERSVARCHECK="PIPE_$OPUSENCODERSYNTAX" ;; + mka) + PIPEENCODERSVARCHECK="PIPE_$MKAENCODERSYNTAX" ;; flac) PIPEENCODERSVARCHECK="PIPE_$FLACENCODERSYNTAX" ;; spx) @@ -4588,7 +4679,7 @@ # Make sure a buncha things exist for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \ - $OGGENCODER $OPUSENCODER $FLACENCODER $SPEEXENCODER $MPCENCODER \ + $OGGENCODER $OPUSENCODER $MKAENCODER $FLACENCODER $SPEEXENCODER $MPCENCODER \ $AACENCODER $WVENCODER $CDDBTOOL $APENCODER $MP2ENCODER $TTAENCODER \ ${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \ ${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/abcde-musicbrainz-tool new/abcde-2.7.2/abcde-musicbrainz-tool --- old/abcde-2.7.1/abcde-musicbrainz-tool 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/abcde-musicbrainz-tool 2016-04-06 10:47:56.000000000 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/perl -# Copyright (c) 2012 Steve McIntyre <93sam(a)debian.org> +# Copyright (c) 2012-2016 Steve McIntyre <93sam(a)debian.org> # This code is hereby licensed for public consumption under either the # GNU GPL v2 or greater, or Larry Wall's Artistic license - your choice. # @@ -96,7 +96,10 @@ $va = 1; } my @events = @{$release->release_event_list()->events()}; - my $rel_year = substr($events[0]->date(),0,4); + my $rel_year = ""; + if ($release->release_event_list()->count() > 0) { + $rel_year = substr($events[0]->date(),0,4); + } $releasenum++; open (OUT, "> $workdir/cddbread.$releasenum"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/abcde.1 new/abcde-2.7.2/abcde.1 --- old/abcde-2.7.1/abcde.1 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/abcde.1 2016-04-06 10:47:56.000000000 +0200 @@ -147,9 +147,9 @@ .TP .B \-o [filetype][:filetypeoptions] Select output type. Can be "vorbis" (or "ogg"), "mp3", "flac", "spx", "mpc", "m4a", -"wav", "wv", "ape" or "opus". Specify a comma-delimited list of output types to obtain -all specified types. See the OUTPUTTYPE configuration variable. One can pass -options to the encoder for a specific filetype on the command line separating +"wav", "wv", "ape", "opus" or "mka". Specify a comma-delimited list of output types +to obtain all specified types. See the OUTPUTTYPE configuration variable. One can +pass options to the encoder for a specific filetype on the command line separating them with a colon. The options must be escaped with double-quotes. .TP .B \-p @@ -227,7 +227,8 @@ subdirectory named after the artist under the current directory. This can be modified using the OUTPUTFORMAT and VAOUTPUTFORMAT variables in your \fIabcde.conf\fR. Each file is given an extension identifying its compression -format, 'vorbis' for '.ogg', '.mp3', '.flac', '.spx', '.mpc', '.wav', 'wv', 'ape' or '.opus'. +format, 'vorbis' for '.ogg', '.mp3', '.flac', '.spx', '.mpc', '.wav', '.wv', +\(aq.ape', '.opus' or '.mka'. .SH CONFIGURATION \fBabcde\fR sources two configuration files on startup - \fI/etc/abcde.conf\fR and \fI$HOME/.abcde.conf\fR, in that order. @@ -355,6 +356,12 @@ Specifies the style of encoder to use for the Opus encoder. At this point only \'opusenc\' is available for Opus encoding. .TP +.B MKAENCODERSYNTAX +Specifies the style of encoder to use for the Matroska or mka container. At this +point only \'ffmpeg\' is available to utilise the mka container. Safe audio codecs +for mka include Vorbis, MP2, MP3, LC-AAC, HE-AAC, WMAv1, WMAv2, AC3, eAC3 and Opus. +See the FAQ document for more information. +.TP .B NORMALIZERSYNTAX Specifies the style of normalizer to use. Valid options are \'default\' and \'normalize'\ (and both run \'normalize-audio\'), since we only support it, @@ -440,16 +447,16 @@ (Ogg/Vorbis), "mp3" (MPEG-1 Audio Layer III), "flac" (Free Lossless Audio Codec), "mp2" (MPEG-1 Audio Layer III), "spx" (Ogg/Speex), "mpc" (MPP/MP+ (Musepack), "m4a" (AAC or ALAC),"wv" (WavPack"), "wav" (Microsoft Waveform), "opus" -(Opus Interactive Audio Codec) or "tta" (True Audio). Values like "vorbis,mp3" -encode the tracks in both Ogg/Vorbis and MP3 formats. For example: +(Opus Interactive Audio Codec), "tta" (True Audio) or "mka" (Matroska). Values like +"vorbis,mp3" encode the tracks in both Ogg/Vorbis and MP3 formats. For example: .br OUTPUTTYPE=vorbis,flac .br For each value in OUTPUTTYPE, \fBabcde\fR expands a different process for encoding, tagging and moving, so you can use the format placeholder, OUTPUT, to create different subdirectories to hold the different types. The variable OUTPUT will -be 'vorbis', 'mp3', 'flac', 'spx', 'mpc', 'm4a', mp2, 'wv', 'ape', 'tta' and/or 'wav', -depending on the OUTPUTTYPE you define. For example +be 'vorbis', 'mp3', 'flac', 'spx', 'mpc', 'm4a', mp2, 'wv', 'ape', 'tta', 'wav' +and/or 'mka' depending on the OUTPUTTYPE you define. For example .br OUTPUTFORMAT='${OUTPUT}/${ARTISTFILE}/${ALBUMFILE}/${TRACKNUM}._${TRACKFILE}' .TP @@ -464,7 +471,7 @@ .TP .B VAOUTPUTFORMAT Just like OUTPUTFORMAT but for Various Artists discs. The default is -'Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}' +\(aqVarious-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}' .TP .B ONETRACKOUTPUTFORMAT Just like OUTPUTFORMAT but for single-track rips (see option "\-1"). The default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/abcde.conf new/abcde-2.7.2/abcde.conf --- old/abcde-2.7.1/abcde.conf 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/abcde.conf 2016-04-06 10:47:56.000000000 +0200 @@ -1,4 +1,4 @@ -# System defaults for abcde version 2.7.1 +# System defaults for abcde version 2.7.2 # Nothing in this file is uncommented by default. # # If you wish to override these system-wide settings, create your own @@ -76,6 +76,7 @@ #OGGENCODERSYNTAX=default #FLACENCODERSYNTAX=default #SPEEXENCODERSYNTAX=default +#MKAENCODERSYNTAX=default #MPCENCODERSYNTAX=default #WVENCODERSYNTAX=default #APENCODERSYNTAX=default @@ -296,7 +297,8 @@ # 'twolame --help',a highly recommended setting is "--bitrate 320". #TWOLAMENCOPTS= -# FFmpeg or avconv can be used for several audio codecs: +# FFmpeg or avconv can be used for several audio codecs, as well as being +# the default encoder for the Matroska container mka:: # 1. Encoding to WavPack (FFmpeg only: avconv does not have a native encoder). # Consider setting the following with a compression_level between 0-8: # FFMPEGENCOPTS="-c:a wavpack -compression_level 6" @@ -376,7 +378,7 @@ # OUTPUTTYPE can be any of a number of formats, either a single format # (e.g. "ogg") or a combination of them separated with "," # (e.g. "flac,mp3"). Currently recognised and supported are: -# "flac", "m4a", "mp3, "mpc", "ogg", "opus", "spx", "vorbis", "wav", "wv", "ape" +# "flac", "m4a", "mp3, "mpc", "ogg", "opus", "mka", "spx", "vorbis", "wav", "wv", "ape" #OUTPUTTYPE=ogg # Output filename format - change this to reflect your inner desire to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/changelog new/abcde-2.7.2/changelog --- old/abcde-2.7.1/changelog 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/changelog 2016-04-06 10:47:56.000000000 +0200 @@ -1,3 +1,37 @@ +abcde 2.7.2 + + * When using musicbrainz, don't assume that there will be release + events attached to a particular CD release. Bug fix for the addition + of year information support in 2.7.1. Thanks to Ed Oehler and Alan W. + Kerr for debugging help. + * Support for output to the Matroska container (mka). Encoder + is FFmpeg (or avconv). Typical conf file syntax would be: + + MKAENCODERSYNTAX=ffmpeg + FFMPEG=ffmpeg + FFMPEGENCOPTS="-c:a ac3 -b:a 448k" + OUTPUTTYPE="mka" + + Thanks to Shantiq and Fakeoutdoorsman of the Ubuntu Forums + for the idea. + * Add id3tag mp3 tagger as this is the tagger available to + OpenBSD users. Thanks to Christopher Zimmermann for the + notification and patch. + * Allow for cddb response 500. Thanks again to Von Welch for the + bug report and patch. This closes Issue 26: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=26 + * Fix for 'expansion of $REDIR' bug on MacOSX. Thanks to Von Welch + for the bug report. This closes Issue 22: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=22 + * Makefile adjusted to allow the sample abcde.conf file to be + installed by default to /etc rather than $(prefix)/etc. + Thanks to Volker Schmidt from archlinux for the bug report: + https://bugs.archlinux.org/task/46671 + * Allow getalbumart to correctly place cover image when single + track is selected. Thanks to Nino Burini for the bug report + and also the fix. This closes Issue 25: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=25 + abcde 2.7.1 * Rebuild of the abcde Makefile. Thanks to Reuben Thomas and Steve @@ -32,6 +66,8 @@ Marco Hoppstaedter for the patch. Closes issue 10: http://abcde.einval.com/bugzilla/show_bug.cgi?id=10 + -- Andrew Strong <andrew.david.strong(a)gmail.com> Sun, 4 Oct 2015 09:31:07 +0000 + abcde 2.7 * Rewrite of abcde's mungefilename function. Thanks to @@ -130,6 +166,8 @@ * Major AAC encoding cleanup, including addition of the fdkaac encoder. Thanks to Doug Mcmahon for assistance with this. + -- Andrew Strong <andrew.david.strong(a)gmail.com> Thu, 18 Jun 2015 12:27:52 +0000 + abcde 2.6 * Fix finding $CDROM on OS X. Thanks to niederstrasser for the patch. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/debian/changelog new/abcde-2.7.2/debian/changelog --- old/abcde-2.7.1/debian/changelog 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/debian/changelog 2016-04-06 10:47:56.000000000 +0200 @@ -1,4 +1,42 @@ -abcde (2.7-1) UNRELEASED; urgency=medium +abcde (2.7.1-1) unstable; urgency=medium + + * New upstream version, with lots of improvements and bugfixes: + + Rebuild of the abcde Makefile. Thanks to Reuben Thomas and Steve + McIntyre as well as ReaperX7, bobzilla, 55020, GazL and dugan from + the Slackware Forums. This closes Issue 4: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=4 + + Fix incorrect use of 'break'. Thanks to Reuben Thomas for the + bug report and fix which closes Issue 6: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=6 + + Make older versions of id3 happy when 'Genre' field is empty. + Thanks to Martin Husemann for the fix which closes Issue 8: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=8 + + Add YEAR and GENRE variables to do_getalbumart(). Thanks to + Johannes Gernemann for this patch which closes issue 9: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=9 + + Support added for encoding to True Audio using tta while still + supporting the older ttaenc. Tagging is with mid3v2. + + Support added for encoding to MPEG-1 Audio Layer II (mp2) + with either twolame or FFmpeg / avconv. Tagging with mid3v2. + + Encoding to WavPack with FFmpeg. Some slight changes to WavPack + syntax with backward compatibility built in for abcde 2.7. + + Encoding to m4a container with FFmpeg or avconv. This allows + for alac encoding with FFmpeg's reverse engineered alac encoder. + + AAC encoding with fhgaacenc via Wine. Tagging is provided + by AtomicParsley which has been added back to abcde :). This + allows encoding with HE-AAC v2, unavailable with qaac. + + Support added for AAC encoding with qaac via Wine. This + also allows for Apple Lossless Audio Coding (alac) using + either qaac or refalac. This closes Issue 142, thanks to + Bernd Fischer-Krellenberg for the enhancement request. + + Grab year information too when using musicbrainz. Thanks to + Marco Hoppstaedter for the patch. Closes issue 10: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=10 + * Update debian/watch to match tne new upstream home. + + -- Steve McIntyre <93sam(a)debian.org> Mon, 02 Nov 2015 18:29:19 +0000 + +abcde (2.7-1) unstable; urgency=medium * Remove Jesus and Colin from Maintainer and Uploaders fields, as they've moved on. Thanks to both for their efforts! @@ -103,7 +141,7 @@ + Major AAC encoding cleanup, including addition of the fdkaac encoder. Thanks to Doug Mcmahon for assistance with this. - -- Steve McIntyre <93sam(a)debian.org> Tue, 16 Jun 2015 21:20:11 +0100 + -- Steve McIntyre <93sam(a)debian.org> Fri, 19 Jun 2015 13:18:14 +0200 abcde (2.6-2) unstable; urgency=medium diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/debian/control new/abcde-2.7.2/debian/control --- old/abcde-2.7.1/debian/control 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/debian/control 2016-04-06 10:47:56.000000000 +0200 @@ -2,7 +2,7 @@ Section: sound Priority: optional Maintainer: Steve McIntyre <93sam(a)debian.org> -Homepage: http://code.google.com/p/abcde/ +Homepage: http://abcde.einval.com/ Standards-Version: 3.9.6 Build-Depends: debhelper (>= 8) Vcs-Browser: http://git.einval.com/cgi-bin/gitweb.cgi?p=abcde.git;a=summary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/debian/rules new/abcde-2.7.2/debian/rules --- old/abcde-2.7.1/debian/rules 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/debian/rules 2016-04-06 10:47:56.000000000 +0200 @@ -12,7 +12,6 @@ build-stamp: dh_testdir - # Add here commands to compile the package. $(MAKE) @@ -36,7 +35,8 @@ dh_installdirs # Add here commands to install the package into debian/abcde. - $(MAKE) install DESTDIR=`pwd`/debian/abcde + $(MAKE) install DESTDIR=`pwd`/debian/abcde prefix=/usr sysconfdir=/etc docdir=/usr/share/doc/abcde + rm -f `pwd`/debian/abcde/usr/share/doc/abcde/COPYING* install -d `pwd`/debian/abcde/usr/share/doc/abcde/examples install -m 644 examples/* `pwd`/debian/abcde/usr/share/doc/abcde/examples diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/debian/watch new/abcde-2.7.2/debian/watch --- old/abcde-2.7.1/debian/watch 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/debian/watch 2016-04-06 10:47:56.000000000 +0200 @@ -1,5 +1,2 @@ version=3 -opts=\ -downloadurlmangle=s|.*[?]name=(.*?)&.*|http://abcde.googlecode.com/files/$1|,\ -filenamemangle=s|[^/]+[?]name=(.*?)&.*|$1| \ -http://code.google.com/p/abcde/downloads/detail[?]name=abcde-([0-9.]+).tar.gz&.* +http://abcde.einval.com/download/abcde-([0-9.]+).tar.gz ++++++ abcde-quote.patch ++++++ --- /var/tmp/diff_new_pack.g799XN/_old 2016-04-30 23:31:03.000000000 +0200 +++ /var/tmp/diff_new_pack.g799XN/_new 2016-04-30 23:31:03.000000000 +0200 @@ -66,15 +66,15 @@ "") ERASEPLAYLIST=e ; DONE=y ;; *) ;; esac -@@ -3230,7 +3230,7 @@ +@@ -3279,7 +3279,7 @@ CDDBTRACKNUM=$(expr $UTRACKNUM - 1) if [ "$USEPIPES" = "y" ]; then TEMPARG="PIPERIPPER_$CDROMREADERSYNTAX" - FILEARG="$( eval echo "\$$TEMPARG" )" + FILEARG="$( eval echo \""\$$TEMPARG"\" )" - REDIR="" PIPE_MESSAGE="and encoding " else + WAVDATA="$ABCDETEMPDIR/track$UTRACKNUM.wav" @@ -4571,15 +4571,15 @@ PIPEENCODERSVARCHECK="PIPE_$AACENCODERSYNTAX" ;; esac

1 0

commit yast2-auth-client for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package yast2-auth-client for openSUSE:Factory checked in at 2016-04-30 23:30:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-auth-client (Old) and /work/SRC/openSUSE:Factory/.yast2-auth-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-auth-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-auth-client/yast2-auth-client.changes 2015-11-26 17:03:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-auth-client.new/yast2-auth-client.changes 2016-04-30 23:31:01.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Mar 22 09:55:56 UTC 2016 - hguo(a)suse.com + +- Introduce many new features: +* Simplify SSSD management interface. +* Enroll to AD directly from SSSD management interface. +* Edit settings for NSS/PAM LDAP. +* Edit settings for Kerberos. + +Implements: fate#319137 fate#320407 +Partly implements: fate#316205 fate#320364 + +------------------------------------------------------------------- Old: ---- yast2-auth-client-3.3.6.tar.bz2 New: ---- yast2-auth-client-3.3.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-auth-client.spec ++++++ --- /var/tmp/diff_new_pack.X2O0nL/_old 2016-04-30 23:31:02.000000000 +0200 +++ /var/tmp/diff_new_pack.X2O0nL/_new 2016-04-30 23:31:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-auth-client # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -17,8 +17,9 @@ Name: yast2-auth-client -Version: 3.3.6 +Version: 3.3.7 Release: 0 +Url: https://github.com/yast/yast-auth-client Summary: YaST2 - Centralised System Authentication Configuration License: GPL-2.0 Group: System/YaST @@ -48,7 +49,6 @@ %description With this YaST2 module you may configure centralised system authentication, on a single or multipe network domains. -The authentication capabilities are provided by SSSD. %prep %setup -n %{name}-%{version} @@ -58,16 +58,13 @@ %install rake install DESTDIR="%{buildroot}" -%post - %files %defattr(-,root,root) -%{yast_desktopdir}/auth-client.desktop -%{yast_moduledir}/AuthClient.rb -%{yast_clientdir}/auth-client*.rb -%{yast_schemadir}/autoyast/rnc/auth-client.rnc -%dir %{yast_libdir}/yauthclient -%{yast_libdir}/yauthclient/* %doc %{yast_docdir} +%{yast_libdir}/ +%{yast_desktopdir}/ +%{yast_clientdir}/ +%{yast_libdir}/ +%{yast_scrconfdir}/ %changelog ++++++ yast2-auth-client-3.3.6.tar.bz2 -> yast2-auth-client-3.3.7.tar.bz2 ++++++ ++++ 11079 lines of diff (skipped)

1 0

commit froxlor for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package froxlor for openSUSE:Factory checked in at 2016-04-30 23:30:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/froxlor (Old) and /work/SRC/openSUSE:Factory/.froxlor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "froxlor" Changes: -------- --- /work/SRC/openSUSE:Factory/froxlor/froxlor.changes 2016-02-11 12:38:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.froxlor.new/froxlor.changes 2016-04-30 23:30:59.000000000 +0200 @@ -1,0 +2,30 @@ +Tue Apr 26 10:42:41 CEST 2016 - asemen(a)suse.de + +- upstream upgrade to version 0.9.35 (bnc#846355) +Bug #1519: Deleting and recreating a mail account ends up with no mail account +Bug #1543: Customer cant create subdomain +Bug #1564: Redirect-Code unveränderbar +Bug #1569: Selection of custom PHP config has no effect once FCGID is enabled +Bug #1599: vHost Template not work +Bug #1600: ssl_cert_chainfile should only contain the intermediate certificate #334 +Bug #1601: FTP-SubUser kann Ordner "lib" nicht erstellen/löschen +Bug #1603: Apache Configuration for Wheezy contains an error in acme.conf +Bug #1604: Wrong acme configuration for Apache 2 +Bug #1609: Sometimes PHP Warning in letsencrypt cronjob Feature #1484: add missing directives in apache-config for php-fpm on freebsd 10.1 +Feature #1611: Show if a domain uses LetsEncrypt in domainlist (admin-account) + +- upstream upgrade to version 0.9.35-rc1 (bnc#846355) +Bug #1522: ProFTPd - relax TLS Options to prevent clients from failing at upload +Bug #1585: Cannot login after timeout +Bug #1586: Directory protection (apache basic auth) broken +Bug #1588: FreeBSD: /scripts/jobs/cron_tasks.php - pw user mod -> pw usermod und loop +Bug #1589: mail clients +Bug #1590: Letsencrypt + Custom SSL +Bug #1591: Entering an IPv6-Adress in the list of allowed AXFR servers leads to an error +Bug #1595: insufficient error handling in admin_configfiles.php +Bug #1598: specialsettingsforsubdomains doesn't get passed along if security question is asked while editing a domain +Feature #1470: Please support letsencrypt.org for fully automatic DV TLS certificate issuance / revocation +Feature #1509: Mehrere Standard-IPs +Feature #1594: Make keysize for LE CSRs configurable + +------------------------------------------------------------------- Old: ---- froxlor-0.9.34.2.tar.bz2 New: ---- froxlor-0.9.35.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ froxlor.spec ++++++ --- /var/tmp/diff_new_pack.faW9Wv/_old 2016-04-30 23:31:00.000000000 +0200 +++ /var/tmp/diff_new_pack.faW9Wv/_new 2016-04-30 23:31:00.000000000 +0200 @@ -20,7 +20,7 @@ %define apache_serverroot /srv/www/htdocs Name: froxlor -Version: 0.9.34.2 +Version: 0.9.35.1 Release: 0 Source0: froxlor-%{version}.tar.bz2 Patch0: froxlor.sql.patch ++++++ froxlor-0.9.34.2.tar.bz2 -> froxlor-0.9.35.1.tar.bz2 ++++++ ++++ 15189 lines of diff (skipped) ++++++ froxlor.sql.patch ++++++ --- /var/tmp/diff_new_pack.faW9Wv/_old 2016-04-30 23:31:01.000000000 +0200 +++ /var/tmp/diff_new_pack.faW9Wv/_new 2016-04-30 23:31:01.000000000 +0200 @@ -1,6 +1,6 @@ ---- install/froxlor.sql.orig 2016-02-10 14:40:21.803176583 +0100 -+++ install/froxlor.sql 2016-02-10 14:42:13.755460921 +0100 -@@ -1,3 +1,14 @@ +--- install/froxlor.sql.orig 2016-04-26 10:53:42.303370421 +0200 ++++ install/froxlor.sql 2016-04-26 10:57:24.858822646 +0200 +@@ -1,3 +1,15 @@ +# change path from /var to /srv +# webspaces: /srv/customers/webs +# logs: /srv/customers/logs/ @@ -10,12 +10,13 @@ +# fcgi: /srv/www/php-fcgi-scripts +# backup: /srv/customers/backups/ +# doc documentroot_prefix /srv/customers/webs/ -+# asemen 20150210 ++# asemen 20160426 ++ + DROP TABLE IF EXISTS `ftp_groups`; CREATE TABLE `ftp_groups` ( `id` int(20) NOT NULL auto_increment, -@@ -385,7 +396,7 @@ +@@ -392,7 +404,7 @@ ('customredirect', 'enabled', '1'), ('customredirect', 'default', '1'), ('perl', 'suexecworkaround', '0'), @@ -24,7 +25,7 @@ ('login', 'domain_login', '0'), ('login', 'maxloginattempts', '3'), ('login', 'deactivatetime', '900'), -@@ -398,13 +409,13 @@ +@@ -405,13 +417,13 @@ ('phpfpm', 'min_spare_servers', '5'), ('phpfpm', 'max_spare_servers', '35'), ('phpfpm', 'max_requests', '0'), @@ -40,7 +41,7 @@ ('phpfpm', 'defaultini', '1'), ('phpfpm', 'vhost_defaultini', '2'), ('phpfpm', 'fastcgi_ipcdir', '/var/lib/apache2/fastcgi/'), -@@ -412,14 +423,14 @@ +@@ -419,14 +431,14 @@ ('nginx', 'fastcgiparams', '/etc/nginx/fastcgi_params'), ('system', 'lastaccountnumber', '0'), ('system', 'lastguid', '9999'), @@ -58,14 +59,45 @@ ('system', 'vmail_maildirname', 'Maildir'), ('system', 'bind_enable', '1'), ('system', 'bindconf_directory', '/etc/bind/'), -@@ -440,8 +451,8 @@ +@@ -447,9 +459,9 @@ ('system', 'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'), ('system', 'webalizer_quiet', '2'), ('system', 'last_archive_run', '000000'), - ('system', 'mod_fcgid_configdir', '/var/www/php-fcgi-scripts'), - ('system', 'mod_fcgid_tmpdir', '/var/customers/tmp'), +- ('system', 'ssl_cert_file', '/etc/apache2/apache2.pem'), + ('system', 'mod_fcgid_configdir', '/srv/www/php-fcgi-scripts'), + ('system', 'mod_fcgid_tmpdir', '/srv/customers/tmp'), - ('system', 'ssl_cert_file', '/etc/apache2/apache2.pem'), ++ ('system', 'ssl_cert_file', '/etc/apache2/ssl.crt/apache2.pem'), ('system', 'use_ssl', '0'), ('system', 'default_vhostconf', ''), + ('system', 'mail_quota_enabled', '0'), +@@ -464,7 +476,7 @@ + ('system', 'mod_fcgid_peardir', '/usr/share/php/:/usr/share/php5/'), + ('system', 'index_file_extension', 'html'), + ('system', 'mod_fcgid_maxrequests', '250'), +- ('system', 'ssl_key_file','/etc/apache2/apache2.key'), ++ ('system', 'ssl_key_file','/etc/apache2/ssl.key/apache2.key'), + ('system', 'ssl_ca_file', ''), + ('system', 'debug_cron', '0'), + ('system', 'store_index_file_subs', '1'), +@@ -504,8 +516,8 @@ + ('system', 'customer_ssl_path', '/etc/ssl/froxlor-custom/'), + ('system', 'allow_error_report_admin', '1'), + ('system', 'allow_error_report_customer', '0'), +- ('system', 'mdalog', '/var/log/mail.log'), +- ('system', 'mtalog', '/var/log/mail.log'), ++ ('system', 'mdalog', '/var/log/mail'), ++ ('system', 'mtalog', '/var/log/mail'), + ('system', 'mdaserver', 'dovecot'), + ('system', 'mtaserver', 'postfix'), + ('system', 'mailtraffic_enabled', '1'), +@@ -521,7 +533,7 @@ + ('system', 'letsencryptca', 'production'), + ('system', 'letsencryptcountrycode', 'DE'), + ('system', 'letsencryptstate', 'Germany'), +- ('system', 'letsencryptchallengepath', '/var/www/froxlor'), ++ ('system', 'letsencryptchallengepath', '/srv/www/froxlor'), + ('system', 'letsencryptkeysize', '4096'), + ('system', 'letsencryptreuseold', 0), + ('system', 'leenabled', '0'),

1 0

commit rofi for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package rofi for openSUSE:Factory checked in at 2016-04-30 23:30:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rofi (Old) and /work/SRC/openSUSE:Factory/.rofi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rofi" Changes: -------- --- /work/SRC/openSUSE:Factory/rofi/rofi.changes 2016-03-17 16:47:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rofi.new/rofi.changes 2016-04-30 23:30:57.000000000 +0200 @@ -1,0 +2,39 @@ +Tue Apr 19 09:56:02 UTC 2016 - mvetter(a)suse.com + +- Update to version 1.0.0 +- Uses xcb instead of xlib now + New Features: + * Blinking cursor + * Separate configuration file + * History in drun mode (#343) + * Context menu mode, show rofi at the mouse pointer + Improvement: + * auto select and single item on dmenu mode (#281) + * Unlimited window title length. + * Correctly follow the active desktop, instead of active window. + * If requesting modi that is not enabled, show it anyway. + * DMenu password mode. (#315) + * Levenshtein sort is now UTF-8 aware. + * Use xcb instead of large xlib library. + * Use GLib mainloop for cleaner code and easier external event based handling in future. + * Run dialog: Try to convert between locale, fs encoding and utf8. Fixing problems with non-utf8 filesystem encodings. + * Try to display non-utf8 strings as good as possible. + * Autocomplete bang hint in combi mode (#380) + * Remove magic line length limits by switching to getline from fgets. + * Print git version for git builds in version string. + Bug fixes: + * Fix subpixel rendering. (#303) + * Fix basic tests on OpenBSD (#272) + * Fix wrong use of memcpy (thx to Jasperia). + * Work around for sigwaitinfo on OpenBSD. + * Ignore invalid entries (non-utf8) in dmenu mode. + * Glib signal handling. + * Fix connecting to i3 on bsd. + * Be able to distinguish between empty and cancel in dmenu mode. (#323) + * Fix memcpy on single memory region. (#312) + * Fix opening file with mode a+ and using fseek to overwrite on bsd. + Regressions + * Removal of old themeing method. Given it was incomplete. + * Removal of daemon mode, given this duplicates Window Manager functionality. + +------------------------------------------------------------------- Old: ---- rofi-0.15.12.tar.gz New: ---- rofi-1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rofi.spec ++++++ --- /var/tmp/diff_new_pack.WpExAh/_old 2016-04-30 23:30:57.000000000 +0200 +++ /var/tmp/diff_new_pack.WpExAh/_new 2016-04-30 23:30:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: rofi -Version: 0.15.12 +Version: 1.0.0 Release: 0 Summary: A window switcher, run dialog and dmenu replacement License: MIT @@ -28,12 +28,13 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: cairo-devel -BuildRequires: libX11-devel -BuildRequires: libXft-devel -BuildRequires: libXinerama-devel +BuildRequires: libxkbcommon-devel +BuildRequires: libxkbcommon-x11-devel BuildRequires: make BuildRequires: pango-devel BuildRequires: startup-notification-devel +BuildRequires: xcb-util-devel +BuildRequires: xcb-util-wm-devel BuildRequires: xorg-x11-devel Requires: xdg-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ rofi-0.15.12.tar.gz -> rofi-1.0.0.tar.gz ++++++ ++++ 20829 lines of diff (skipped) ++++++ xdg-terminal.patch ++++++ --- /var/tmp/diff_new_pack.WpExAh/_old 2016-04-30 23:30:58.000000000 +0200 +++ /var/tmp/diff_new_pack.WpExAh/_new 2016-04-30 23:30:58.000000000 +0200 @@ -1,23 +1,23 @@ -diff -urEbwB rofi-0.15.12/config/config.c rofi-0.15.12.new/config/config.c ---- rofi-0.15.12/config/config.c 2015-12-26 13:46:13.000000000 +0100 -+++ rofi-0.15.12.new/config/config.c 2016-03-07 10:42:24.070762155 +0100 -@@ -78,16 +78,16 @@ - .menu_hlbg_urgent = "#DC322F", - .menu_hlbg_active = "#268BD2", +diff -urEbwB rofi-1.0.0/config/config.c rofi-1.0.0.new/config/config.c +--- rofi-1.0.0/config/config.c 2016-04-03 13:34:33.000000000 +0200 ++++ rofi-1.0.0.new/config/config.c 2016-04-19 11:47:04.843817905 +0200 +@@ -56,16 +56,16 @@ + .color_window = "#fdf6e3,#002b36", + /** Terminal to use. (for ssh and open in terminal) */ - .terminal_emulator = "rofi-sensible-terminal", + .terminal_emulator = "xdg-terminal", .ssh_client = "ssh", /** Command when executing ssh. */ - .ssh_command = "{terminal} -e {ssh-client} {host}", -+ .ssh_command = "xdg-terminal '{ssh-client} {host}'", ++ .ssh_command = "{terminal} {ssh-client} {host}", /** Command when running */ .run_command = "{cmd}", /** Command used to list executable commands. empty -> internal */ .run_list_command = "", /** Command executed when running application in terminal */ - .run_shell_command = "{terminal} -e {cmd}", -+ .run_shell_command = "xdg-terminal '{cmd}'", ++ .run_shell_command = "{terminal} {cmd}", /** * Location of the window. * Enumeration indicating location or gravity of window.

1 0

commit dice for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package dice for openSUSE:Factory checked in at 2016-04-30 23:30:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dice (Old) and /work/SRC/openSUSE:Factory/.dice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dice" Changes: -------- --- /work/SRC/openSUSE:Factory/dice/dice.changes 2015-11-26 17:03:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dice.new/dice.changes 2016-04-30 23:30:55.000000000 +0200 @@ -1,0 +2,27 @@ +Tue Apr 19 11:59:28 CEST 2016 - ms(a)suse.de + +- Run build and bundle in UTF-8 locale + +------------------------------------------------------------------- +Mon Apr 18 16:13:43 CEST 2016 - ms(a)suse.de + +- add option to skip dockerhub container update + +------------------------------------------------------------------- +Mon Apr 18 09:25:58 CEST 2016 - ms(a)suse.de + +- Move to kiwi next generation + +------------------------------------------------------------------- +Sun Apr 17 15:43:04 CEST 2016 - ms(a)suse.de + +- Fixed evaluation of yast2 dist URI's + +------------------------------------------------------------------- +Sun Apr 17 15:07:54 CEST 2016 - ms(a)suse.de + +- Fixed unit test for create_solv + + Check for raise condition was incomplete + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dice.spec ++++++ --- /var/tmp/diff_new_pack.LFUzaI/_old 2016-04-30 23:30:55.000000000 +0200 +++ /var/tmp/diff_new_pack.LFUzaI/_new 2016-04-30 23:30:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dice # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 ++++++ dice-0.7.7.gem ++++++ Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/cli.rb new/lib/cli.rb --- old/lib/cli.rb 2015-11-16 15:09:34.000000000 +0100 +++ new/lib/cli.rb 2016-04-19 12:03:14.000000000 +0200 @@ -83,14 +83,26 @@ LONGDESC arg "RECIPE-PATH" command :build do |c| - c.switch ["force", :f], :required => false, :negatable => false, + c.switch ["force", :f], + :required => false, + :negatable => false, :desc => "Force building even if status is up to data" - c.switch ["skip-missing", :i], :required => false, :negatable => false, + c.switch ["skip-missing", :i], + :required => false, + :negatable => false, :desc => "Skip packages not found in the repositories" - c.flag ["kiwitype", :t], :kiwitype => String, :required => false, + c.flag ["kiwitype", :t], + :kiwitype => String, + :required => false, :desc => "Set kiwi build type" - c.flag ["kiwiprofile", :p], :kiwiprofile => String, :required => false, + c.flag ["kiwiprofile", :p], + :kiwiprofile => String, + :required => false, :desc => "Set kiwi build profile" + c.switch ["skip-container-update", :s], + :required => false, + :negatable => false, + :desc => "Skip build system container update from dockerhub" c.action do |global_options,options,args| Dice.setup_options(options) description = shift_arg(args, "RECIPE-PATH") @@ -111,7 +123,9 @@ LONGDESC arg "RECIPE-PATH" command :buildlog do |c| - c.switch ["show", :s], :required => false, :negatable => false, + c.switch ["show", :s], + :required => false, + :negatable => false, :desc => "Just show the log if present, skip test for build process" c.action do |global_options,options,args| Dice.setup_options(options) @@ -151,7 +165,9 @@ LONGDESC arg "RECIPE-PATH" command :status do |c| - c.switch ["skip-missing", :i], :required => false, :negatable => false, + c.switch ["skip-missing", :i], + :required => false, + :negatable => false, :desc => "Skip packages not found in the repositories" c.action do |global_options,options,args| Dice.setup_options(options) @@ -194,7 +210,9 @@ LONGDESC arg "RECIPE-PATH" command :cleanup do |c| - c.switch ["lock", :l], :required => false, :negatable => false, + c.switch ["lock", :l], + :required => false, + :negatable => false, :desc => "Cleanup stale semaphore lock if present" c.action do |global_options,options,args| Dice.setup_options(options) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/docker_build_system.rb new/lib/docker_build_system.rb --- old/lib/docker_build_system.rb 2015-11-16 15:09:34.000000000 +0100 +++ new/lib/docker_build_system.rb 2016-04-19 12:03:14.000000000 +0200 @@ -9,6 +9,9 @@ end def up + if Dice.option["skip-container-update"] + return + end Dice.logger.info( "#{self.class}: Pulling buildsystem from dockerhub #{recipe.basepath}..." ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/job.rb new/lib/job.rb --- old/lib/job.rb 2015-11-16 15:09:34.000000000 +0100 +++ new/lib/job.rb 2016-04-19 12:03:14.000000000 +0200 @@ -14,17 +14,19 @@ def build prepare_build Dice.logger.info("#{self.class}: Building...") - build_opts = "--build /vagrant -d /tmp/#{job_name} --logfile terminal" + build_opts = "--debug" if Dice.option.kiwitype build_opts += " --type #{Dice.option.kiwitype}" end if Dice.option.kiwiprofile - build_opts += " --add-profile #{Dice.option.kiwiprofile}" + build_opts += " --profile #{Dice.option.kiwiprofile}" end + build_opts += " system build" + + " --description /vagrant --target-dir /tmp/#{job_name}" logfile = File.open(build_log, "w") logfile.sync = true - kiwi_environment = "export KIWI_IGNORE_OLD_MOUNTS=1" - kiwi_command = "bash -c '#{kiwi_environment}; /usr/sbin/kiwi #{build_opts}'" + kiwi_environment = "LANG=en_US.UTF-8" + kiwi_command = "bash -c '#{kiwi_environment}; kiwi #{build_opts}'" begin Command.run( buildsystem.job_builder_command(kiwi_command), @@ -46,9 +48,11 @@ Dice.logger.info("#{self.class}: Bundle results...") logfile = File.open(build_log, "a") logfile.sync = true - bundle_opts = "--bundle-build /tmp/#{job_name} --bundle-id DiceBuild " + - "--destdir /tmp/#{bundle_name} --logfile terminal" - kiwi_command = "/usr/sbin/kiwi #{bundle_opts}" + bundle_opts = "--target-dir /tmp/#{job_name} --id DiceBuild " + + "--bundle-dir /tmp/#{bundle_name}" + kiwi_environment = "LANG=en_US.UTF-8" + kiwi_command = "bash -c '#{kiwi_environment}; "+ + "kiwi result bundle #{bundle_opts}'" begin Command.run( buildsystem.job_builder_command(kiwi_command), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kiwi_uri.rb new/lib/kiwi_uri.rb --- old/lib/kiwi_uri.rb 2015-11-16 15:09:34.000000000 +0100 +++ new/lib/kiwi_uri.rb 2016-04-19 12:03:14.000000000 +0200 @@ -4,18 +4,24 @@ # normalize url types available in a kiwi configuration into # standard mime types. This also includes resolving open build # service resource locator into http addresses - case args[:name] - when /^obs:\/\/(\d.*)/ + if args[:repo_type] == "yast2" # distribution URL pointing to a yast distro repo - args[:name] = "http://download.opensuse.org/distribution/#{$1}/" - when /^obs:\/\/(.*)/ - # obs url, translate to http url - bs_path = $1.gsub(/:/, ":/") - bs_path = bs_path.gsub(/:\/\//, ":/") - args[:name] = "http://download.opensuse.org/repositories/#{bs_path}" - when /^(\/.*)/ - # Simple path, should be a distribution dir - args[:name] = "dir://#{$1}/" + bs_project = args[:name].gsub(/obs:\/\//, "") + args[:name] = "http://download.opensuse.org/distribution/#{bs_project}/" + else + case args[:name] + when /^obs:\/\/(\d.*)/ + # distribution URL pointing to a rpm-md distro repo + args[:name] = "http://download.opensuse.org/distribution/#{$1}/" + when /^obs:\/\/(.*)/ + # obs url, translate to http url + bs_path = $1.gsub(/:/, ":/") + bs_path = bs_path.gsub(/:\/\//, ":/") + args[:name] = "http://download.opensuse.org/repositories/#{bs_path}" + when /^(\/.*)/ + # Simple path, should be a distribution dir + args[:name] = "dir://#{$1}/" + end end RepoUri.new(args) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-11-16 15:09:34.000000000 +0100 +++ new/metadata 2016-04-19 12:03:14.000000000 +0200 @@ -8,7 +8,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2015-11-16 00:00:00.000000000 Z +date: 2016-04-19 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: cheetah

1 0

commit ghc-wai-logger for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package ghc-wai-logger for openSUSE:Factory checked in at 2016-04-30 23:30:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wai-logger (Old) and /work/SRC/openSUSE:Factory/.ghc-wai-logger.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-wai-logger" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wai-logger/ghc-wai-logger.changes 2016-01-22 01:08:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-wai-logger.new/ghc-wai-logger.changes 2016-04-30 23:30:53.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 26 09:22:36 UTC 2016 - mimi.vx(a)gmail.com + +- update to 2.2.7 + +------------------------------------------------------------------- Old: ---- wai-logger-2.2.5.tar.gz New: ---- wai-logger-2.2.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wai-logger.spec ++++++ --- /var/tmp/diff_new_pack.CKW01b/_old 2016-04-30 23:30:53.000000000 +0200 +++ /var/tmp/diff_new_pack.CKW01b/_new 2016-04-30 23:30:53.000000000 +0200 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-wai-logger -Version: 2.2.5 +Version: 2.2.7 Release: 0 Summary: A logging system for WAI License: MIT @@ -34,12 +34,10 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: -BuildRequires: ghc-auto-update-devel BuildRequires: ghc-blaze-builder-devel BuildRequires: ghc-byteorder-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-case-insensitive-devel -BuildRequires: ghc-easy-file-devel BuildRequires: ghc-fast-logger-devel BuildRequires: ghc-http-types-devel BuildRequires: ghc-network-devel ++++++ wai-logger-2.2.5.tar.gz -> wai-logger-2.2.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-logger-2.2.5/Network/Wai/Logger/Apache.hs new/wai-logger-2.2.7/Network/Wai/Logger/Apache.hs --- old/wai-logger-2.2.5/Network/Wai/Logger/Apache.hs 2016-01-13 08:28:24.000000000 +0100 +++ new/wai-logger-2.2.7/Network/Wai/Logger/Apache.hs 2016-04-18 07:47:40.000000000 +0200 @@ -14,7 +14,6 @@ import Data.ByteString.Char8 (ByteString) import qualified Data.ByteString.Char8 as BS -import Data.CaseInsensitive (CI) import Data.List (find) import Data.Maybe (fromMaybe) #if MIN_VERSION_base(4,5,0) @@ -24,7 +23,6 @@ #endif import Network.HTTP.Types (Status, statusCode) import Network.Wai (Request(..)) -import Network.Wai.Logger.Date import Network.Wai.Logger.IP import System.Log.FastLogger @@ -42,7 +40,7 @@ | FromFallback -- | Apache style log format. -apacheLogStr :: IPAddrSource -> ZonedDate -> Request -> Status -> Maybe Integer -> LogStr +apacheLogStr :: IPAddrSource -> FormattedTime -> Request -> Status -> Maybe Integer -> LogStr apacheLogStr ipsrc tmstr req status msize = toLogStr (getSourceIP ipsrc req) <> " - - [" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-logger-2.2.5/Network/Wai/Logger/Date.hs new/wai-logger-2.2.7/Network/Wai/Logger/Date.hs --- old/wai-logger-2.2.5/Network/Wai/Logger/Date.hs 2016-01-13 08:28:24.000000000 +0100 +++ new/wai-logger-2.2.7/Network/Wai/Logger/Date.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,88 +0,0 @@ -{-# LANGUAGE CPP, OverloadedStrings #-} - --- | --- Formatting time is slow. --- This package provides mechanisms to cache formatted date. -module Network.Wai.Logger.Date ( - -- * Types - DateCacheGetter - , DateCacheUpdater - , ZonedDate - -- * Cache configuration - , DateCacheConf(..) - , zonedDateCacheConf - -- * Date cacher - , clockDateCacher - ) where - -import Control.AutoUpdate (mkAutoUpdate, defaultUpdateSettings, updateAction) -import Data.ByteString (ByteString) -#if WINDOWS -import qualified Data.ByteString.Char8 as BS -import Data.Time (UTCTime, formatTime, getCurrentTime, utcToLocalZonedTime) -# if MIN_VERSION_time(1,5,0) -import Data.Time (defaultTimeLocale) -# else -import System.Locale (defaultTimeLocale) -# endif -#else -import Data.UnixTime (formatUnixTime, fromEpochTime) -import System.Posix (EpochTime, epochTime) -#endif - ----------------------------------------------------------------- - --- | Getting cached 'ZonedDate'. -type DateCacheGetter = IO ZonedDate --- | Updateing cached 'ZonedDate'. This should be called every second. --- See the source code of 'withStdoutLogger'. -type DateCacheUpdater = IO () - ----------------------------------------------------------------- - --- | A type for zoned date. -type ZonedDate = ByteString - ----------------------------------------------------------------- - -data DateCacheConf t = DateCacheConf { - -- | A function to get a time. E.g 'epochTime' and 'getCurrentTime'. - getTime :: IO t - -- | A function to format a time. - , formatDate :: t -> IO ByteString - } - -#if WINDOWS --- | Zoned date cacher using UTC. -zonedDateCacheConf :: DateCacheConf UTCTime -zonedDateCacheConf = DateCacheConf { - getTime = getCurrentTime - , formatDate = \ut -> do - zt <- utcToLocalZonedTime ut - return $ BS.pack $ formatTime defaultTimeLocale "%d/%b/%Y:%T %z" zt - } -#else --- | Zoned date cacher using UnixTime. -zonedDateCacheConf :: DateCacheConf EpochTime -zonedDateCacheConf = DateCacheConf { - getTime = epochTime - , formatDate = formatUnixTime "%d/%b/%Y:%T %z" . fromEpochTime - } -#endif - ----------------------------------------------------------------- - --- | --- Returning 'DateCacheGetter' and 'DateCacheUpdater'. --- --- Note: Since version 2.1.2, this function uses the auto-update package --- internally, and therefore the @DateCacheUpdater@ value returned need --- not be called. To wit, the return value is in fact an empty action. - -clockDateCacher :: IO (DateCacheGetter, DateCacheUpdater) -clockDateCacher = do - getter <- mkAutoUpdate defaultUpdateSettings - { updateAction = getTime zonedDateCacheConf - >>= formatDate zonedDateCacheConf - } - return (getter, return ()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-logger-2.2.5/Network/Wai/Logger.hs new/wai-logger-2.2.7/Network/Wai/Logger.hs --- old/wai-logger-2.2.5/Network/Wai/Logger.hs 2016-01-13 08:28:24.000000000 +0100 +++ new/wai-logger-2.2.7/Network/Wai/Logger.hs 2016-04-18 07:47:40.000000000 +0200 @@ -1,3 +1,5 @@ +{-# LANGUAGE CPP #-} + -- | Apache style logger for WAI applications. -- -- An example: @@ -39,29 +41,26 @@ , IPAddrSource(..) , LogType(..) , FileLogSpec(..) - -- * Date cacher + -- * Utilities + , showSockAddr + , logCheck + -- * Backward compability , clockDateCacher , ZonedDate , DateCacheGetter , DateCacheUpdater - -- * Utilities - , logCheck - , showSockAddr ) where +#if __GLASGOW_HASKELL__ < 709 import Control.Applicative ((<$>)) -import Control.AutoUpdate (mkAutoUpdate, defaultUpdateSettings, updateAction) -import Control.Concurrent (MVar, newMVar, tryTakeMVar, putMVar) -import Control.Exception (handle, SomeException(..), bracket) -import Control.Monad (when, void) +#endif +import Control.Exception (bracket) +import Control.Monad (void) import Network.HTTP.Types (Status) import Network.Wai (Request) -import System.EasyFile (getFileSize) import System.Log.FastLogger import Network.Wai.Logger.Apache -import Network.Wai.Logger.Date -import Network.Wai.Logger.IORef import Network.Wai.Logger.IP (showSockAddr) ---------------------------------------------------------------- @@ -74,8 +73,8 @@ app aplogger where setup = do - (getter, _updater) <- clockDateCacher - apf <- initLogger FromFallback (LogStdout 4096) getter + tgetter <- newTimeCache simpleTimeFormat + apf <- initLogger FromFallback (LogStdout 4096) tgetter let aplogger = apacheLogger apf remover = logRemover apf return (aplogger, remover) @@ -96,135 +95,50 @@ , logRemover :: IO () } --- | Logger Type. -data LogType = LogNone -- ^ No logging. - | LogStdout BufSize -- ^ Logging to stdout. - -- 'BufSize' is a buffer size - -- for each capability. - | LogFile FileLogSpec BufSize -- ^ Logging to a file. - -- 'BufSize' is a buffer size - -- for each capability. - -- File rotation is done on-demand. - | LogCallback (LogStr -> IO ()) (IO ()) - ---------------------------------------------------------------- --- | --- Creating 'ApacheLogger' according to 'LogType'. -initLogger :: IPAddrSource -> LogType -> DateCacheGetter +-- | Creating 'ApacheLogger' according to 'LogType'. +initLogger :: IPAddrSource -> LogType -> IO FormattedTime -> IO ApacheLoggerActions -initLogger _ LogNone _ = noLoggerInit -initLogger ipsrc (LogStdout size) dateget = stdoutLoggerInit ipsrc size dateget -initLogger ipsrc (LogFile spec size) dateget = fileLoggerInit ipsrc spec size dateget -initLogger ipsrc (LogCallback cb flush) dateget = callbackLoggerInit ipsrc cb flush dateget - ----------------------------------------------------------------- +initLogger ipsrc typ tgetter = do + (fl, cleanUp) <- newFastLogger typ + return $ ApacheLoggerActions (apache fl ipsrc tgetter) (return ()) cleanUp -noLoggerInit :: IO ApacheLoggerActions -noLoggerInit = return ApacheLoggerActions { - apacheLogger = noLogger - , logRotator = noRotator - , logRemover = noRemover - } - where - noLogger _ _ _ = return () - noRotator = return () - noRemover = return () - -stdoutLoggerInit :: IPAddrSource -> BufSize -> DateCacheGetter - -> IO ApacheLoggerActions -stdoutLoggerInit ipsrc size dateget = do - lgrset <- newStdoutLoggerSet size - let logger = apache (pushLogStr lgrset) ipsrc dateget - noRotator = return () - remover = rmLoggerSet lgrset - return ApacheLoggerActions { - apacheLogger = logger - , logRotator = noRotator - , logRemover = remover - } - -fileLoggerInit :: IPAddrSource -> FileLogSpec -> BufSize -> DateCacheGetter - -> IO ApacheLoggerActions -fileLoggerInit ipsrc spec size dateget = do - lgrset <- newFileLoggerSet size $ log_file spec - ref <- newIORef (0 :: Int) - mvar <- newMVar () - let logger a b c = do - cnt <- decrease ref - apache (pushLogStr lgrset) ipsrc dateget a b c - when (cnt <= 0) $ tryRotate lgrset spec ref mvar - noRotator = return () - remover = rmLoggerSet lgrset - return ApacheLoggerActions { - apacheLogger = logger - , logRotator = noRotator - , logRemover = remover - } - -decrease :: IORef Int -> IO Int -decrease ref = atomicModifyIORef' ref (\x -> (x - 1, x - 1)) - -callbackLoggerInit :: IPAddrSource -> (LogStr -> IO ()) -> IO () -> DateCacheGetter - -> IO ApacheLoggerActions -callbackLoggerInit ipsrc cb flush dateget = do - flush' <- mkAutoUpdate defaultUpdateSettings - { updateAction = flush - } - let logger a b c = apache cb ipsrc dateget a b c >> flush' - noRotator = return () - remover = return () - return ApacheLoggerActions { - apacheLogger = logger - , logRotator = noRotator - , logRemover = remover - } +--- | Checking if a log file can be written if 'LogType' is 'LogFileNoRotate' or 'LogFile'. +logCheck :: LogType -> IO () +logCheck LogNone = return () +logCheck (LogStdout _) = return () +logCheck (LogStderr _) = return () +logCheck (LogFileNoRotate fp _) = check fp +logCheck (LogFile spec _) = check (log_file spec) +logCheck (LogCallback _ _) = return () ---------------------------------------------------------------- -apache :: (LogStr -> IO ()) -> IPAddrSource -> DateCacheGetter -> ApacheLogger +apache :: (LogStr -> IO ()) -> IPAddrSource -> IO FormattedTime -> ApacheLogger apache cb ipsrc dateget req st mlen = do zdata <- dateget cb (apacheLogStr ipsrc zdata req st mlen) ----------------------------------------------------------------- +--------------------------------------------------------------- -tryRotate :: LoggerSet -> FileLogSpec -> IORef Int -> MVar () -> IO () -tryRotate lgrset spec ref mvar = bracket lock unlock rotateFiles - where - lock = tryTakeMVar mvar - unlock Nothing = return () - unlock _ = putMVar mvar () - rotateFiles Nothing = return () - rotateFiles _ = do - msiz <- getSize - case msiz of - -- A file is not available. - -- So, let's set a big value to the counter so that - -- this function is not called frequently. - Nothing -> writeIORef ref 1000000 - Just siz - | siz > limit -> do - rotate spec - renewLoggerSet lgrset - writeIORef ref $ estimate limit - | otherwise -> do - writeIORef ref $ estimate (limit - siz) - file = log_file spec - limit = log_file_size spec - getSize = handle (\(SomeException _) -> return Nothing) $ do - -- The log file is locked by GHC. - -- We need to get its file size by the way not using locks. - Just . fromIntegral <$> getFileSize file - -- 200 is an ad-hoc value for the length of log line. - estimate x = fromInteger (x `div` 200) +-- | Getting cached 'ZonedDate'. +type DateCacheGetter = IO ZonedDate ----------------------------------------------------------------- +-- | Updateing cached 'ZonedDate'. This should be called every second. +-- See the source code of 'withStdoutLogger'. +type DateCacheUpdater = IO () + +-- | A type for zoned date. +type ZonedDate = FormattedTime -- | --- Checking if a log file can be written if 'LogType' is 'LogFile'. -logCheck :: LogType -> IO () -logCheck LogNone = return () -logCheck (LogStdout _) = return () -logCheck (LogFile spec _) = check spec -logCheck (LogCallback _ _) = return () +-- Returning 'DateCacheGetter' and 'DateCacheUpdater'. +-- +-- Note: Since version 2.1.2, this function uses the auto-update package +-- internally, and therefore the @DateCacheUpdater@ value returned need +-- not be called. To wit, the return value is in fact an empty action. +clockDateCacher :: IO (DateCacheGetter, DateCacheUpdater) +clockDateCacher = do + tgetter <- newTimeCache simpleTimeFormat + return (tgetter, return ()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-logger-2.2.5/wai-logger.cabal new/wai-logger-2.2.7/wai-logger.cabal --- old/wai-logger-2.2.5/wai-logger.cabal 2016-01-13 08:28:24.000000000 +0100 +++ new/wai-logger-2.2.7/wai-logger.cabal 2016-04-18 07:47:40.000000000 +0200 @@ -1,5 +1,5 @@ Name: wai-logger -Version: 2.2.5 +Version: 2.2.7 Author: Kazu Yamamoto <kazu(a)iij.ad.jp> Maintainer: Kazu Yamamoto <kazu(a)iij.ad.jp> License: BSD3 @@ -15,17 +15,14 @@ GHC-Options: -Wall Exposed-Modules: Network.Wai.Logger Other-Modules: Network.Wai.Logger.Apache - Network.Wai.Logger.Date Network.Wai.Logger.IP Network.Wai.Logger.IORef Build-Depends: base >= 4 && < 5 - , auto-update , blaze-builder , byteorder , bytestring , case-insensitive - , easy-file >= 0.2 - , fast-logger >= 2.2 + , fast-logger >= 2.4.5 , http-types , network , wai >= 2.0.0

1 0

commit ghc-wai-extra for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package ghc-wai-extra for openSUSE:Factory checked in at 2016-04-30 23:30:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wai-extra (Old) and /work/SRC/openSUSE:Factory/.ghc-wai-extra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-wai-extra" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wai-extra/ghc-wai-extra.changes 2016-03-31 13:02:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-wai-extra.new/ghc-wai-extra.changes 2016-04-30 23:30:51.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 26 09:19:11 UTC 2016 - mimi.vx(a)gmail.com + +- update to 3.0.15.1 +* don't use deprecated CRT functions on Windows + +------------------------------------------------------------------- Old: ---- wai-extra-3.0.15.tar.gz New: ---- wai-extra-3.0.15.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wai-extra.spec ++++++ --- /var/tmp/diff_new_pack.qUEMFg/_old 2016-04-30 23:30:51.000000000 +0200 +++ /var/tmp/diff_new_pack.qUEMFg/_new 2016-04-30 23:30:51.000000000 +0200 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-wai-extra -Version: 3.0.15 +Version: 3.0.15.1 Release: 0 Summary: Provides some basic WAI handlers and middleware License: MIT ++++++ wai-extra-3.0.15.tar.gz -> wai-extra-3.0.15.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-extra-3.0.15/ChangeLog.md new/wai-extra-3.0.15.1/ChangeLog.md --- old/wai-extra-3.0.15/ChangeLog.md 2016-03-22 10:15:32.000000000 +0100 +++ new/wai-extra-3.0.15.1/ChangeLog.md 2016-04-25 15:20:48.000000000 +0200 @@ -1,3 +1,7 @@ +## 3.0.15.1 + +* don't use deprecated CRT functions on Windows [#544](https://github.com/yesodweb/wai/pull/544) + ## 3.0.15 * add requestSizeCheck [#525](https://github.com/yesodweb/wai/pull/525) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-extra-3.0.15/Network/Wai/Handler/SCGI.hs new/wai-extra-3.0.15.1/Network/Wai/Handler/SCGI.hs --- old/wai-extra-3.0.15/Network/Wai/Handler/SCGI.hs 2016-03-22 10:15:32.000000000 +0100 +++ new/wai-extra-3.0.15.1/Network/Wai/Handler/SCGI.hs 2016-04-25 15:20:34.000000000 +0200 @@ -1,4 +1,4 @@ -{-# LANGUAGE ForeignFunctionInterface #-} +{-# LANGUAGE CPP, ForeignFunctionInterface #-} module Network.Wai.Handler.SCGI ( run , runSendfile @@ -86,6 +86,16 @@ foreign import ccall unsafe "accept" c'accept :: CInt -> Ptr a -> Ptr a -> IO CInt +#if WINDOWS +foreign import ccall unsafe "_close" + c'close :: CInt -> IO CInt + +foreign import ccall unsafe "_write" + c'write :: CInt -> Ptr CChar -> CInt -> IO CInt + +foreign import ccall unsafe "_read" + c'read :: CInt -> Ptr CChar -> CInt -> IO CInt +#else foreign import ccall unsafe "close" c'close :: CInt -> IO CInt @@ -94,3 +104,4 @@ foreign import ccall unsafe "read" c'read :: CInt -> Ptr CChar -> CInt -> IO CInt +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-extra-3.0.15/wai-extra.cabal new/wai-extra-3.0.15.1/wai-extra.cabal --- old/wai-extra-3.0.15/wai-extra.cabal 2016-03-22 10:15:32.000000000 +0100 +++ new/wai-extra-3.0.15.1/wai-extra.cabal 2016-04-25 15:20:53.000000000 +0200 @@ -1,5 +1,5 @@ Name: wai-extra -Version: 3.0.15 +Version: 3.0.15.1 Synopsis: Provides some basic WAI handlers and middleware. description: Provides basic WAI handler and middleware functionality: @@ -82,7 +82,7 @@ README.md Library - Build-Depends: base >= 4 && < 5 + Build-Depends: base >= 4.6 && < 5 , bytestring >= 0.9.1.4 , wai >= 3.0.3.0 && < 3.3 , old-locale >= 1.0.0.2 && < 1.1 @@ -95,8 +95,8 @@ , text >= 0.7 , case-insensitive >= 0.2 , data-default-class - , fast-logger >= 2.1 && < 2.5 - , wai-logger >= 2.0 && < 2.3 + , fast-logger >= 2.4.5 && < 2.5 + , wai-logger >= 2.2.6 && < 2.3 , ansi-terminal , resourcet >= 0.4.6 && < 1.2 , void >= 0.5

1 0

commit ghc-vector-binary-instances for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package ghc-vector-binary-instances for openSUSE:Factory checked in at 2016-04-30 23:30:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-vector-binary-instances (Old) and /work/SRC/openSUSE:Factory/.ghc-vector-binary-instances.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-vector-binary-instances" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-vector-binary-instances/ghc-vector-binary-instances.changes 2016-03-16 10:36:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-vector-binary-instances.new/ghc-vector-binary-instances.changes 2016-04-30 23:30:45.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 26 09:14:52 UTC 2016 - mimi.vx(a)gmail.com + +- update to 0.2.3.2 + +------------------------------------------------------------------- Old: ---- vector-binary-instances-0.2.3.1.tar.gz New: ---- vector-binary-instances-0.2.3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-vector-binary-instances.spec ++++++ --- /var/tmp/diff_new_pack.yEzB4K/_old 2016-04-30 23:30:45.000000000 +0200 +++ /var/tmp/diff_new_pack.yEzB4K/_new 2016-04-30 23:30:45.000000000 +0200 @@ -19,7 +19,7 @@ %global pkg_name vector-binary-instances Name: ghc-vector-binary-instances -Version: 0.2.3.1 +Version: 0.2.3.2 Release: 0 Summary: Instances of Data.Binary and Data.Serialize for vector License: BSD-3-Clause ++++++ vector-binary-instances-0.2.3.1.tar.gz -> vector-binary-instances-0.2.3.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vector-binary-instances-0.2.3.1/benchmarks/Benchmarks.hs new/vector-binary-instances-0.2.3.2/benchmarks/Benchmarks.hs --- old/vector-binary-instances-0.2.3.1/benchmarks/Benchmarks.hs 2016-03-13 12:20:32.000000000 +0100 +++ new/vector-binary-instances-0.2.3.2/benchmarks/Benchmarks.hs 2016-04-21 21:46:41.000000000 +0200 @@ -1,11 +1,16 @@ import Criterion.Main import Data.Binary import Data.Binary.Get +import Data.Binary.Put import qualified Data.ByteString.Lazy as BS import qualified Data.Vector.Unboxed as U import Data.Vector.Binary +-- We take care to avoid using the @Binary@ instances here to avoid issues with +-- overlapping instances as the install plan will involve two different versions +-- of k@vector-binary-instances@ (as @Criterion@ transitively depends upon +-- @vector-binary-instances@). See #7 for details. vec1,vec2,vec3,vec4,vec5 :: U.Vector Int vec1 = U.enumFromN 0 3 @@ -15,11 +20,11 @@ vec5 = U.enumFromN 0 300000 bs1,bs2,bs3,bs4,bs5 :: BS.ByteString -bs1 = encode vec1 -bs2 = encode vec2 -bs3 = encode vec3 -bs4 = encode vec4 -bs5 = encode vec5 +bs1 = encodeVector vec1 +bs2 = encodeVector vec2 +bs3 = encodeVector vec3 +bs4 = encodeVector vec4 +bs5 = encodeVector vec5 naiveGet :: (Binary a, U.Unbox a) => Get (U.Vector a) naiveGet = do @@ -36,20 +41,23 @@ type V = BS.ByteString -> U.Vector Int +encodeVector :: U.Vector Int -> BS.ByteString +encodeVector = runPut . genericPutVector + benchGetSize :: String -> BS.ByteString -> Benchmark benchGetSize name bs = bgroup name - [ bench "U.Vector Int" $ nf (decode :: V) bs - , bench "naive U.Vector Int" $ nf (runGet naiveGet :: V) bs - , bench "noinline naive U.Vector Int" $ nf (runGet naiveGet' :: V) bs + [ bench "U.Vector Int" $ nf (runGet genericGetVector :: V) bs + , bench "naive U.Vector Int" $ nf (runGet naiveGet :: V) bs + , bench "noinline naive U.Vector Int" $ nf (runGet naiveGet' :: V) bs ] main = defaultMain [ bgroup "encode" - [ bench "U.Vector Int 3" $ nf encode vec1 - , bench "U.Vector Int 30" $ nf encode vec2 - , bench "U.Vector Int 300" $ nf encode vec3 - , bench "U.Vector Int 30000" $ nf encode vec4 - , bench "U.Vector Int 300000" $ nf encode vec5 + [ bench "U.Vector Int 3" $ nf encodeVector vec1 + , bench "U.Vector Int 30" $ nf encodeVector vec2 + , bench "U.Vector Int 300" $ nf encodeVector vec3 + , bench "U.Vector Int 30000" $ nf encodeVector vec4 + , bench "U.Vector Int 300000" $ nf encodeVector vec5 ] , bgroup "decode" [ benchGetSize "size=3" bs1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vector-binary-instances-0.2.3.1/vector-binary-instances.cabal new/vector-binary-instances-0.2.3.2/vector-binary-instances.cabal --- old/vector-binary-instances-0.2.3.1/vector-binary-instances.cabal 2016-03-13 12:20:32.000000000 +0100 +++ new/vector-binary-instances-0.2.3.2/vector-binary-instances.cabal 2016-04-21 21:46:41.000000000 +0200 @@ -1,5 +1,5 @@ Name: vector-binary-instances -Version: 0.2.3.1 +Version: 0.2.3.2 Synopsis: Instances of Data.Binary and Data.Serialize for vector Description: Instances for Binary for the types defined in the vector package,

1 0

commit ghc-turtle for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package ghc-turtle for openSUSE:Factory checked in at 2016-04-30 23:30:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-turtle (Old) and /work/SRC/openSUSE:Factory/.ghc-turtle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-turtle" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-turtle/ghc-turtle.changes 2016-04-12 19:38:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-turtle.new/ghc-turtle.changes 2016-04-30 23:30:43.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 26 09:12:20 UTC 2016 - mimi.vx(a)gmail.com + +- update to 1.2.7 + +------------------------------------------------------------------- Old: ---- turtle-1.2.6.tar.gz New: ---- turtle-1.2.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-turtle.spec ++++++ --- /var/tmp/diff_new_pack.2447ke/_old 2016-04-30 23:30:44.000000000 +0200 +++ /var/tmp/diff_new_pack.2447ke/_new 2016-04-30 23:30:44.000000000 +0200 @@ -19,8 +19,8 @@ %bcond_with tests -Name: ghc-%{pkg_name} -Version: 1.2.6 +Name: ghc-turtle +Version: 1.2.7 Release: 0 Summary: Shell programming, Haskell-style Group: System/Libraries ++++++ turtle-1.2.6.tar.gz -> turtle-1.2.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/turtle-1.2.6/turtle.cabal new/turtle-1.2.7/turtle.cabal --- old/turtle-1.2.6/turtle.cabal 2016-04-03 20:32:35.000000000 +0200 +++ new/turtle-1.2.7/turtle.cabal 2016-04-25 02:54:40.000000000 +0200 @@ -1,5 +1,5 @@ Name: turtle -Version: 1.2.6 +Version: 1.2.7 Cabal-Version: >=1.10 Build-Type: Simple License: BSD3 @@ -48,7 +48,7 @@ Build-Depends: base >= 4.5 && < 5 , async >= 2.0.0.0 && < 2.2, - clock >= 0.4.1.2 && < 0.7, + clock >= 0.4.1.2 && < 0.8, directory >= 1.0.7 && < 1.3, foldl >= 1.1 && < 1.3, hostname < 1.1,

1 0

commit ghc-tls for openSUSE:Factory
by root＠hilbert.suse.de 30 Apr '16

30 Apr '16

Hello community, here is the log from the commit of package ghc-tls for openSUSE:Factory checked in at 2016-04-30 23:30:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-tls (Old) and /work/SRC/openSUSE:Factory/.ghc-tls.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-tls" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-tls/ghc-tls.changes 2016-01-08 15:22:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-tls.new/ghc-tls.changes 2016-04-30 23:30:42.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Apr 10 19:02:03 UTC 2016 - mimi.vx(a)gmail.com + +- update to 1.3.5 +* Fix a bug with ECDHE based cipher where serialization +* Improve tests +* Debugging: Add a way to print random seed and a way to side-load + a seed for replayability + +------------------------------------------------------------------- Old: ---- tls-1.3.4.tar.gz New: ---- tls-1.3.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-tls.spec ++++++ --- /var/tmp/diff_new_pack.0jmYOG/_old 2016-04-30 23:30:43.000000000 +0200 +++ /var/tmp/diff_new_pack.0jmYOG/_new 2016-04-30 23:30:43.000000000 +0200 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-tls -Version: 1.3.4 +Version: 1.3.5 Release: 0 Summary: TLS/SSL protocol native implementation (Server and Client) License: BSD-3-Clause ++++++ tls-1.3.4.tar.gz -> tls-1.3.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tls-1.3.4/Benchmarks/Benchmarks.hs new/tls-1.3.5/Benchmarks/Benchmarks.hs --- old/tls-1.3.4/Benchmarks/Benchmarks.hs 2015-12-12 15:51:40.000000000 +0100 +++ new/tls-1.3.5/Benchmarks/Benchmarks.hs 2016-04-09 15:47:25.000000000 +0200 @@ -35,7 +35,7 @@ } (pubKey, privKey) = getGlobalRSAPair -runTLSPipe params tlsServer tlsClient d name = bench name $ do +runTLSPipe params tlsServer tlsClient d name = bench name . nfIO $ do (startQueue, resultQueue) <- establishDataPipe params tlsServer tlsClient writeChan startQueue d readChan resultQueue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tls-1.3.4/CHANGELOG.md new/tls-1.3.5/CHANGELOG.md --- old/tls-1.3.4/CHANGELOG.md 2015-12-12 15:51:40.000000000 +0100 +++ new/tls-1.3.5/CHANGELOG.md 2016-04-09 15:47:25.000000000 +0200 @@ -1,3 +1,17 @@ +## Version 1.3.5 + +- Fix a bug with ECDHE based cipher where serialization +- Debugging: Add a way to print random seed and a way to side-load a seed for replayability +- Improve tests + +## Version 1.3.4 + +- Fix tests on 32 bits `time_t` machines (time not within bound) +- VirtualHost: Add a way to load credentials related to the hostname used by the client (Julian Beaumont) +- VirtualHost: Expose an API to query which hostname the client has contacted (Julian Beaumont) +- Add a way to disable empty packet that are use for security when + using old versions + old CBC based cipher (Anton Dessiatov) + ## Version 1.3.3 - Add support for Hans (Haskell Network Stack) (Adam Wick) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tls-1.3.4/Network/TLS/Context.hs new/tls-1.3.5/Network/TLS/Context.hs --- old/tls-1.3.4/Network/TLS/Context.hs 2015-12-12 15:51:40.000000000 +0100 +++ new/tls-1.3.5/Network/TLS/Context.hs 2016-04-09 15:47:25.000000000 +0200 @@ -98,6 +98,7 @@ instance TLSParams ClientParams where getTLSCommonParams cparams = ( clientSupported cparams , clientShared cparams + , clientDebug cparams ) getTLSRole _ = ClientRole getCiphers cparams = supportedCiphers $ clientSupported cparams @@ -107,6 +108,7 @@ instance TLSParams ServerParams where getTLSCommonParams sparams = ( serverSupported sparams , serverShared sparams + , serverDebug sparams ) getTLSRole _ = ServerRole -- on the server we filter our allowed ciphers here according @@ -144,11 +146,17 @@ contextNew backend params = liftIO $ do initializeBackend backend - rng <- newStateRNG + let (supported, shared, debug) = getTLSCommonParams params + + seed <- case debugSeed debug of + Nothing -> do seed <- seedNew + debugPrintSeed debug $ seed + return seed + Just determ -> return determ + let rng = newStateRNG seed let role = getTLSRole params st = newTLSState rng role - (supported, shared) = getTLSCommonParams params ciphers = getCiphers params when (null ciphers) $ error "no ciphers available with those parameters" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tls-1.3.4/Network/TLS/Crypto/DH.hs new/tls-1.3.5/Network/TLS/Crypto/DH.hs --- old/tls-1.3.4/Network/TLS/Crypto/DH.hs 2015-12-12 15:51:40.000000000 +0100 +++ new/tls-1.3.5/Network/TLS/Crypto/DH.hs 2016-04-09 15:47:25.000000000 +0200 @@ -17,15 +17,14 @@ , dhUnwrapPublic ) where -import Network.TLS.Util.Serialization (i2osp) import qualified Crypto.PubKey.DH as DH -import Network.TLS.RNG -import Data.ByteString (ByteString) +import Crypto.Number.Basic (numBits) +import Network.TLS.RNG type DHPublic = DH.PublicNumber type DHPrivate = DH.PrivateNumber type DHParams = DH.Params -type DHKey = ByteString +type DHKey = DH.SharedKey dhPublic :: Integer -> DHPublic dhPublic = DH.PublicNumber @@ -34,7 +33,7 @@ dhPrivate = DH.PrivateNumber dhParams :: Integer -> Integer -> DHParams -dhParams = DH.Params +dhParams p g = DH.Params p g (numBits p) dhGenerateKeyPair :: MonadRandom r => DHParams -> r (DHPrivate, DHPublic) dhGenerateKeyPair params = do @@ -43,18 +42,16 @@ return (priv, pub) dhGetShared :: DHParams -> DHPrivate -> DHPublic -> DHKey -dhGetShared params priv pub = - let (DH.SharedKey sk) = DH.getShared params priv pub - in i2osp sk +dhGetShared params priv pub = DH.getShared params priv pub dhUnwrap :: DHParams -> DHPublic -> [Integer] -dhUnwrap (DH.Params p g) (DH.PublicNumber y) = [p,g,y] +dhUnwrap (DH.Params p g _) (DH.PublicNumber y) = [p,g,y] dhParamsGetP :: DHParams -> Integer -dhParamsGetP (DH.Params p _) = p +dhParamsGetP (DH.Params p _ _) = p dhParamsGetG :: DHParams -> Integer -dhParamsGetG (DH.Params _ g) = g +dhParamsGetG (DH.Params _ g _) = g dhUnwrapPublic :: DHPublic -> Integer dhUnwrapPublic (DH.PublicNumber y) = y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tls-1.3.4/Network/TLS/Crypto/ECDH.hs new/tls-1.3.5/Network/TLS/Crypto/ECDH.hs --- old/tls-1.3.4/Network/TLS/Crypto/ECDH.hs 2015-12-12 15:51:40.000000000 +0100 +++ new/tls-1.3.5/Network/TLS/Crypto/ECDH.hs 2016-04-09 15:47:25.000000000 +0200 @@ -15,13 +15,12 @@ , ecdhUnwrapPublic ) where -import Network.TLS.Util.Serialization (i2osp, lengthBytes) +import Network.TLS.Util.Serialization (lengthBytes) import Network.TLS.Extension.EC import qualified Crypto.PubKey.ECC.DH as ECDH import qualified Crypto.PubKey.ECC.Types as ECDH import qualified Crypto.PubKey.ECC.Prim as ECC (isPointValid) import Network.TLS.RNG -import Data.ByteString (ByteString) import Data.Word (Word16) data ECDHPublic = ECDHPublic ECDH.PublicPoint Int {- byte size -} @@ -31,7 +30,7 @@ data ECDHParams = ECDHParams ECDH.Curve ECDH.CurveName deriving (Show,Eq) -type ECDHKey = ByteString +type ECDHKey = ECDH.SharedKey ecdhPublic :: Integer -> Integer -> Int -> ECDHPublic ecdhPublic x y siz = ECDHPublic (ECDH.Point x y) siz @@ -55,11 +54,8 @@ ecdhGetShared :: ECDHParams -> ECDHPrivate -> ECDHPublic -> Maybe ECDHKey ecdhGetShared (ECDHParams curve _) (ECDHPrivate priv) (ECDHPublic point _) - | ECC.isPointValid curve point = - let ECDH.SharedKey sk = ECDH.getShared curve priv point - in Just $ i2osp sk - | otherwise = - Nothing + | ECC.isPointValid curve point = Just $ ECDH.getShared curve priv point + | otherwise = Nothing -- for server key exchange ecdhUnwrap :: ECDHParams -> ECDHPublic -> (Word16,Integer,Integer,Int) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tls-1.3.4/Network/TLS/Extra/Cipher.hs new/tls-1.3.5/Network/TLS/Extra/Cipher.hs --- old/tls-1.3.4/Network/TLS/Extra/Cipher.hs 2015-12-12 15:51:40.000000000 +0100 +++ new/tls-1.3.5/Network/TLS/Extra/Cipher.hs 2016-04-09 15:47:25.000000000 +0200 @@ -98,10 +98,10 @@ tripledes_ede :: BulkDirection -> BulkKey -> BulkBlock tripledes_ede BulkEncrypt key = let ctx = noFail $ cipherInit key - in (\iv input -> let output = cbcEncrypt ctx (tripledes_iv iv) input in (output, takelast 16 output)) + in (\iv input -> let output = cbcEncrypt ctx (tripledes_iv iv) input in (output, takelast 8 output)) tripledes_ede BulkDecrypt key = let ctx = noFail $ cipherInit key - in (\iv input -> let output = cbcDecrypt ctx (tripledes_iv iv) input in (output, takelast 16 input)) + in (\iv input -> let output = cbcDecrypt ctx (tripledes_iv iv) input in (output, takelast 8 input)) tripledes_iv :: BulkIV -> IV DES_EDE3 tripledes_iv iv = maybe (error "tripledes cipher iv internal error") id $ makeIV iv @@ -262,7 +262,7 @@ cipher_AES128_SHA1 :: Cipher cipher_AES128_SHA1 = Cipher { cipherID = 0x2f - , cipherName = "RSA-aes128-sha1" + , cipherName = "RSA-AES128-SHA1" , cipherBulk = bulk_aes128 , cipherHash = SHA1 , cipherKeyExchange = CipherKeyExchange_RSA @@ -273,7 +273,7 @@ cipher_AES256_SHA1 :: Cipher cipher_AES256_SHA1 = Cipher { cipherID = 0x35 - , cipherName = "RSA-aes256-sha1" + , cipherName = "RSA-AES256-SHA1" , cipherBulk = bulk_aes256 , cipherHash = SHA1 , cipherKeyExchange = CipherKeyExchange_RSA @@ -284,7 +284,7 @@ cipher_AES128_SHA256 :: Cipher cipher_AES128_SHA256 = Cipher { cipherID = 0x3c - , cipherName = "RSA-aes128-sha256" + , cipherName = "RSA-AES128-SHA256" , cipherBulk = bulk_aes128 , cipherHash = SHA256 , cipherKeyExchange = CipherKeyExchange_RSA @@ -295,7 +295,7 @@ cipher_AES256_SHA256 :: Cipher cipher_AES256_SHA256 = Cipher { cipherID = 0x3d - , cipherName = "RSA-aes256-sha256" + , cipherName = "RSA-AES256-SHA256" , cipherBulk = bulk_aes256 , cipherHash = SHA256 , cipherKeyExchange = CipherKeyExchange_RSA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tls-1.3.4/Network/TLS/Handshake/Server.hs new/tls-1.3.5/Network/TLS/Handshake/Server.hs --- old/tls-1.3.4/Network/TLS/Handshake/Server.hs 2015-12-12 15:51:40.000000000 +0100 +++ new/tls-1.3.5/Network/TLS/Handshake/Server.hs 2016-04-09 15:47:25.000000000 +0200 @@ -327,7 +327,7 @@ signed <- digitallySignECDHParams ctx serverParams sigAlg case sigAlg of SignatureRSA -> return $ SKX_ECDHE_RSA serverParams signed - _ -> error ("generate skx_dhe unsupported signature type: " ++ show sigAlg) + _ -> error ("generate skx_ecdhe unsupported signature type: " ++ show sigAlg) -- create a DigitallySigned objects for DHParams or ECDHParams. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tls-1.3.4/Network/TLS/Handshake/State.hs new/tls-1.3.5/Network/TLS/Handshake/State.hs --- old/tls-1.3.4/Network/TLS/Handshake/State.hs 2015-12-12 15:51:40.000000000 +0100 +++ new/tls-1.3.5/Network/TLS/Handshake/State.hs 2016-04-09 15:47:25.000000000 +0200 @@ -54,6 +54,7 @@ import Control.Applicative (Applicative, (<$>)) import Control.Monad.State import Data.X509 (CertificateChain) +import Data.ByteArray (ByteArrayAccess) data HandshakeKeyState = HandshakeKeyState { hksRemotePublicKey :: !(Maybe PubKey) @@ -194,9 +195,10 @@ | otherwise = generateServerFinished -- | Generate the master secret from the pre master secret. -setMasterSecretFromPre :: Version -- ^ chosen transmission version - -> Role -- ^ the role (Client or Server) of the generating side - -> Bytes -- ^ the pre master secret +setMasterSecretFromPre :: ByteArrayAccess preMaster + => Version -- ^ chosen transmission version + -> Role -- ^ the role (Client or Server) of the generating side + -> preMaster -- ^ the pre master secret -> HandshakeM () setMasterSecretFromPre ver role premasterSecret = do secret <- genSecret <$> get diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tls-1.3.4/Network/TLS/Packet.hs new/tls-1.3.5/Network/TLS/Packet.hs --- old/tls-1.3.4/Network/TLS/Packet.hs 2015-12-12 15:51:40.000000000 +0100 +++ new/tls-1.3.5/Network/TLS/Packet.hs 2016-04-09 15:47:25.000000000 +0200 @@ -76,6 +76,8 @@ import Data.ByteString (ByteString) import qualified Data.ByteString as B import qualified Data.ByteString.Char8 as BC +import Data.ByteArray (ByteArrayAccess) +import qualified Data.ByteArray as B (convert) data CurrentParams = CurrentParams { cParamsVersion :: Version -- ^ current protocol version @@ -579,18 +581,18 @@ -} type PRF = Bytes -> Bytes -> Int -> Bytes -generateMasterSecret_SSL :: Bytes -> ClientRandom -> ServerRandom -> Bytes +generateMasterSecret_SSL :: ByteArrayAccess preMaster => preMaster -> ClientRandom -> ServerRandom -> Bytes generateMasterSecret_SSL premasterSecret (ClientRandom c) (ServerRandom s) = B.concat $ map (computeMD5) ["A","BB","CCC"] - where computeMD5 label = hash MD5 $ B.concat [ premasterSecret, computeSHA1 label ] - computeSHA1 label = hash SHA1 $ B.concat [ label, premasterSecret, c, s ] + where computeMD5 label = hash MD5 $ B.concat [ B.convert premasterSecret, computeSHA1 label ] + computeSHA1 label = hash SHA1 $ B.concat [ label, B.convert premasterSecret, c, s ] -generateMasterSecret_TLS :: PRF -> Bytes -> ClientRandom -> ServerRandom -> Bytes +generateMasterSecret_TLS :: ByteArrayAccess preMaster => PRF -> preMaster -> ClientRandom -> ServerRandom -> Bytes generateMasterSecret_TLS prf premasterSecret (ClientRandom c) (ServerRandom s) = - prf premasterSecret seed 48 + prf (B.convert premasterSecret) seed 48 where seed = B.concat [ "master secret", c, s ] -generateMasterSecret :: Version -> Bytes -> ClientRandom -> ServerRandom -> Bytes +generateMasterSecret :: ByteArrayAccess preMaster => Version -> preMaster -> ClientRandom -> ServerRandom -> Bytes generateMasterSecret SSL2 = generateMasterSecret_SSL generateMasterSecret SSL3 = generateMasterSecret_SSL generateMasterSecret TLS10 = generateMasterSecret_TLS prf_MD5SHA1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tls-1.3.4/Network/TLS/Parameters.hs new/tls-1.3.5/Network/TLS/Parameters.hs --- old/tls-1.3.4/Network/TLS/Parameters.hs 2015-12-12 15:51:40.000000000 +0100 +++ new/tls-1.3.5/Network/TLS/Parameters.hs 2016-04-09 15:47:25.000000000 +0200 @@ -10,6 +10,7 @@ ClientParams(..) , ServerParams(..) , CommonParams + , DebugParams(..) , ClientHooks(..) , ServerHooks(..) , Supported(..) @@ -32,13 +33,37 @@ import Network.TLS.Crypto import Network.TLS.Credentials import Network.TLS.X509 +import Network.TLS.RNG (Seed) import Data.Monoid import Data.Default.Class import qualified Data.ByteString as B type HostName = String -type CommonParams = (Supported, Shared) +type CommonParams = (Supported, Shared, DebugParams) + +-- | All settings should not be used in production +data DebugParams = DebugParams + { + -- | Disable the true randomness in favor of deterministic seed that will produce + -- a deterministic random from. This is useful for tests and debugging purpose. + -- Do not use in production + debugSeed :: Maybe Seed + -- | Add a way to print the seed that was randomly generated. re-using the same seed + -- will reproduce the same randomness with 'debugSeed' + , debugPrintSeed :: Seed -> IO () + } + +defaultDebugParams :: DebugParams +defaultDebugParams = DebugParams + { debugSeed = Nothing + , debugPrintSeed = const (return ()) + } + +instance Show DebugParams where + show _ = "DebugParams" +instance Default DebugParams where + def = defaultDebugParams data ClientParams = ClientParams { clientUseMaxFragmentLength :: Maybe MaxFragmentEnum @@ -60,6 +85,7 @@ , clientShared :: Shared , clientHooks :: ClientHooks , clientSupported :: Supported + , clientDebug :: DebugParams } deriving (Show) defaultParamsClient :: HostName -> Bytes -> ClientParams @@ -71,6 +97,7 @@ , clientShared = def , clientHooks = def , clientSupported = def + , clientDebug = defaultDebugParams } data ServerParams = ServerParams @@ -89,6 +116,7 @@ , serverShared :: Shared , serverHooks :: ServerHooks , serverSupported :: Supported + , serverDebug :: DebugParams } deriving (Show) defaultParamsServer :: ServerParams @@ -99,6 +127,7 @@ , serverHooks = def , serverShared = def , serverSupported = def + , serverDebug = defaultDebugParams } instance Default ServerParams where @@ -275,6 +304,6 @@ } instance Show ServerHooks where - show _ = "ClientHooks" + show _ = "ServerHooks" instance Default ServerHooks where def = defaultServerHooks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tls-1.3.4/Network/TLS/RNG.hs new/tls-1.3.5/Network/TLS/RNG.hs --- old/tls-1.3.4/Network/TLS/RNG.hs 2015-12-12 15:51:40.000000000 +0100 +++ new/tls-1.3.5/Network/TLS/RNG.hs 2016-04-09 15:47:25.000000000 +0200 @@ -1,12 +1,17 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-} module Network.TLS.RNG ( StateRNG(..) + , Seed + , seedNew + , seedToInteger + , seedFromInteger , withTLSRNG , newStateRNG , MonadRandom , getRandomBytes ) where +import Crypto.Random.Types import Crypto.Random newtype StateRNG = StateRNG ChaChaDRG @@ -20,5 +25,5 @@ -> (a, StateRNG) withTLSRNG rng f = withDRG rng f -newStateRNG :: MonadRandom randomly => randomly StateRNG -newStateRNG = StateRNG `fmap` drgNew +newStateRNG :: Seed -> StateRNG +newStateRNG seed = StateRNG $ drgNewSeed seed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tls-1.3.4/Network/TLS.hs new/tls-1.3.5/Network/TLS.hs --- old/tls-1.3.4/Network/TLS.hs 2015-12-12 15:51:40.000000000 +0100 +++ new/tls-1.3.5/Network/TLS.hs 2016-04-09 15:47:25.000000000 +0200 @@ -11,6 +11,7 @@ -- * Context configuration ClientParams(..) , ServerParams(..) + , DebugParams(..) , ClientHooks(..) , ServerHooks(..) , Supported(..) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tls-1.3.4/tls.cabal new/tls-1.3.5/tls.cabal --- old/tls-1.3.4/tls.cabal 2015-12-12 15:51:40.000000000 +0100 +++ new/tls-1.3.5/tls.cabal 2016-04-09 15:47:25.000000000 +0200 @@ -1,5 +1,5 @@ Name: tls -Version: 1.3.4 +Version: 1.3.5 Description: Native Haskell TLS and SSL protocol implementation for server and client. . @@ -28,7 +28,7 @@ CHANGELOG.md Flag compat - Description: Accept SSLv2 compatible handshake + Description: Accept SSLv2 client hello for beginning SSLv3 / TLS handshake Default: True Flag network @@ -48,7 +48,7 @@ , data-default-class -- crypto related , memory - , cryptonite >= 0.7 + , cryptonite >= 0.14 -- certificate related , asn1-types >= 0.2.0 , asn1-encoding @@ -145,11 +145,12 @@ , x509-validation , data-default-class , cryptonite - , criterion + , criterion >= 1.0 , mtl , bytestring , hourglass , QuickCheck >= 2 + , tasty-quickcheck source-repository head type: git

1 0