openSUSE Commits September 2015

commit@lists.opensuse.org

1 participants
1128 discussions

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package virt-viewer for openSUSE:Factory checked in at 2015-09-30 05:53:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-viewer (Old) and /work/SRC/openSUSE:Factory/.virt-viewer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-viewer" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-viewer/virt-viewer.changes 2015-01-14 11:45:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virt-viewer.new/virt-viewer.changes 2015-09-30 05:53:19.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 21 15:06:17 MDT 2015 - carnold(a)suse.com + +- bsc#946816 - virt-viewer: version 2.0 can't connect to Xen VMs + reverse-3d5627d7-for-xen.patch + +------------------------------------------------------------------- New: ---- reverse-3d5627d7-for-xen.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-viewer.spec ++++++ --- /var/tmp/diff_new_pack.GjrvAn/_old 2015-09-30 05:53:20.000000000 +0200 +++ /var/tmp/diff_new_pack.GjrvAn/_new 2015-09-30 05:53:20.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %if %suse_version >= 1315 %define gtk_arg --with-gtk=3.0 %else @@ -34,6 +33,7 @@ Patch51: windows-keycombo.patch Patch52: netware-keycombo.patch Patch53: virtview-desktop.patch +Patch54: reverse-3d5627d7-for-xen.patch ExclusiveArch: %ix86 x86_64 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -78,6 +78,7 @@ %patch51 -p1 %patch52 -p1 %patch53 -p1 +%patch54 -p1 %build echo "suse_version = %suse_version" ++++++ reverse-3d5627d7-for-xen.patch ++++++ Revert this commit From: Marc-André Lureau marcandre.lureau(a)gmail.com Wed Nov 12 11:14:19 2014 +0100 Subject: virt-viewer: allow connection to unix socket only server Date: Tue Nov 25 15:07:32 2014 +0100: Git: 3d5627d79a32bea5337659652e09be0d009940a4 Even when the server doesn't provide a display connection address, virt-viewer is able to connect to guest with libvirt attach. Index: virt-viewer-2.0/src/virt-viewer.c =================================================================== --- virt-viewer-2.0.orig/src/virt-viewer.c +++ virt-viewer-2.0/src/virt-viewer.c @@ -428,18 +428,17 @@ virt_viewer_extract_connect_info(VirtVie ghost = virt_viewer_extract_xpath_string(xmldesc, xpath); } else { xpath = g_strdup_printf("string(/domain/devices/graphics[@type='%s']/@socket)", type); - unixsock = virt_viewer_extract_xpath_string(xmldesc, xpath); + if ((unixsock = virt_viewer_extract_xpath_string(xmldesc, xpath)) == NULL) { + virt_viewer_app_simple_message_dialog(app, _("Cannot determine the graphic address for the guest %s"), + priv->domkey); + goto cleanup; + } } - if (ghost && gport) { + if (ghost && gport) g_debug("Guest graphics address is %s:%s", ghost, gport); - } else if (unixsock) { + else if (unixsock) g_debug("Guest graphics address is %s", unixsock); - } else { - g_debug("Using direct libvirt connection"); - retval = TRUE; - goto cleanup; - } uri = virConnectGetURI(priv->conn); if (virt_viewer_util_extract_host(uri, NULL, &host, &transport, &user, &port) < 0) {

6 years, 9 months

commit GeoIP for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package GeoIP for openSUSE:Factory checked in at 2015-09-30 05:53:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/GeoIP (Old) and /work/SRC/openSUSE:Factory/.GeoIP.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "GeoIP" Changes: -------- --- /work/SRC/openSUSE:Factory/GeoIP/GeoIP.changes 2015-03-30 19:32:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.GeoIP.new/GeoIP.changes 2015-09-30 05:53:18.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Sep 28 15:05:10 UTC 2015 - mpluskal(a)suse.com + +- Update to 1.6.6 + * Replaced usage of deprecated fileno, read, and lseek on Visual + Studio 2005+ with their ISO C++ conformant replacements. + * A warning about using a double as a float was fixed. + * Fixed segfault when doing a lookup on an empty database. + * Fixed a memcheck error from valgrind in the _check_mtime + function. + * Fixed _check_mtime to check the return value of gettimeofday + rather than just assuming it worked. + +------------------------------------------------------------------- Old: ---- GeoIP-1.6.5.tar.gz New: ---- GeoIP-1.6.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ GeoIP.spec ++++++ --- /var/tmp/diff_new_pack.THJkAr/_old 2015-09-30 05:53:19.000000000 +0200 +++ /var/tmp/diff_new_pack.THJkAr/_new 2015-09-30 05:53:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: GeoIP -Version: 1.6.5 +Version: 1.6.6 Release: 0 Summary: Library to find the country that any IP address originates from License: LGPL-2.1+ ++++++ GeoIP-1.6.5.tar.gz -> GeoIP-1.6.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GeoIP-1.6.5/COPYING new/GeoIP-1.6.6/COPYING --- old/GeoIP-1.6.5/COPYING 2012-10-08 23:32:25.000000000 +0200 +++ new/GeoIP-1.6.6/COPYING 2015-03-10 17:01:38.000000000 +0100 @@ -1,8 +1,3 @@ -[ Note that while the core GeoIP library is licensed under the -LGPL, the libGeoIPUpdate library depends on md5.c and types.h -which are licensed under the GPL. ] - - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 @@ -151,7 +146,7 @@ on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GeoIP-1.6.5/ChangeLog new/GeoIP-1.6.6/ChangeLog --- old/GeoIP-1.6.5/ChangeLog 2015-02-25 23:29:48.000000000 +0100 +++ new/GeoIP-1.6.6/ChangeLog 2015-07-28 21:48:54.000000000 +0200 @@ -1,3 +1,17 @@ +1.6.6 2015-07-28 + +* Replaced usage of deprecated fileno, read, and lseek on Visual Studio 2005+ + with their ISO C++ conformant replacements. (Fix by ClaudiuHKS. GitHub #55.) +* A warning about using a double as a float was fixed. (Fix by ClaudiuHKS. + GitHub #56.) +* Fixed segfault when doing a lookup on an empty database. (Fix by NesoK. + GitHub #62.) +* Fixed a memcheck error from valgrind in the `_check_mtime` + function. (Reported by yurivct. GitHub #60.) +* Fixed `_check_mtime` to check the return value of `gettimeofday` rather than + just assuming it worked. + + 1.6.5 2015-02-25 * A segmentation fault in `geoiplookup` was fixed when the utility was passed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GeoIP-1.6.5/GeoIP.spec new/GeoIP-1.6.6/GeoIP.spec --- old/GeoIP-1.6.5/GeoIP.spec 2015-02-25 23:31:31.000000000 +0100 +++ new/GeoIP-1.6.6/GeoIP.spec 2015-07-28 21:51:00.000000000 +0200 @@ -1,5 +1,5 @@ Name: GeoIP -Version: 1.6.5 +Version: 1.6.6 Summary: GeoIP is a C library finds the location of an IP address. Release: 1 Group: System Environment/Libraries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GeoIP-1.6.5/LICENSE new/GeoIP-1.6.6/LICENSE --- old/GeoIP-1.6.5/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/GeoIP-1.6.6/LICENSE 2015-03-10 16:24:33.000000000 +0100 @@ -0,0 +1,28 @@ +There are two licenses, one for the C library software, and one for +the GeoLite Country database. + +SOFTWARE LICENSE + +Copyright (C) 2015 MaxMind, Inc. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +For a copy of the LGPL License, see the COPYING file. + +DATA LICENSE (GeoLite Country and City Databases) + +The GeoLite databases are distributed under the Creative Commons +Attribution-ShareAlike 3.0 Unported License. The attribution +requirement may be met by including the following in all advertising +and documentation mentioning features of or use of this database: + + This product includes GeoLite data created by MaxMind, available from + <a href="http://www.maxmind.com">http://www.maxmind.com</a>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GeoIP-1.6.5/Makefile.am new/GeoIP-1.6.6/Makefile.am --- old/GeoIP-1.6.5/Makefile.am 2015-01-27 19:42:09.000000000 +0100 +++ new/GeoIP-1.6.6/Makefile.am 2015-03-10 17:13:03.000000000 +0100 @@ -12,4 +12,4 @@ pkgconfigdir = $(libdir)/pkgconfig/ nodist_pkgconfig_DATA = geoip.pc -EXTRA_DIST = NEWS.md README.md README.OSX bootstrap GeoIP.spec GeoIP.spec.in Makefile.vc get_ver.awk geoip.ico geoip.pc.in data/GeoIP.dat +EXTRA_DIST = LICENSE NEWS.md README.md README.OSX bootstrap GeoIP.spec GeoIP.spec.in Makefile.vc get_ver.awk geoip.ico geoip.pc.in data/GeoIP.dat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GeoIP-1.6.5/Makefile.in new/GeoIP-1.6.6/Makefile.in --- old/GeoIP-1.6.5/Makefile.in 2015-02-25 23:31:06.000000000 +0100 +++ new/GeoIP-1.6.6/Makefile.in 2015-07-28 21:50:45.000000000 +0200 @@ -350,7 +350,7 @@ pkgconfigdir = $(libdir)/pkgconfig/ nodist_pkgconfig_DATA = geoip.pc -EXTRA_DIST = NEWS.md README.md README.OSX bootstrap GeoIP.spec GeoIP.spec.in Makefile.vc get_ver.awk geoip.ico geoip.pc.in data/GeoIP.dat +EXTRA_DIST = LICENSE NEWS.md README.md README.OSX bootstrap GeoIP.spec GeoIP.spec.in Makefile.vc get_ver.awk geoip.ico geoip.pc.in data/GeoIP.dat all: all-recursive .SUFFIXES: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GeoIP-1.6.5/apps/geoiplookup.c new/GeoIP-1.6.6/apps/geoiplookup.c --- old/GeoIP-1.6.5/apps/geoiplookup.c 2015-02-25 23:28:41.000000000 +0100 +++ new/GeoIP-1.6.6/apps/geoiplookup.c 2015-07-28 21:47:39.000000000 +0200 @@ -290,7 +290,7 @@ } }else if (GEOIP_COUNTRY_EDITION == i) { country_id = GeoIP_id_by_ipnum(gi, ipnum); - if (country_id < 0 || country_id >= (int) GeoIP_num_countries()) { + if (country_id < 0 || country_id >= (int)GeoIP_num_countries()) { printf("%s: Invalid database\n", GeoIPDBDescription[i]); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GeoIP-1.6.5/apps/geoiplookup6.c new/GeoIP-1.6.6/apps/geoiplookup6.c --- old/GeoIP-1.6.5/apps/geoiplookup6.c 2015-02-25 23:28:41.000000000 +0100 +++ new/GeoIP-1.6.6/apps/geoiplookup6.c 2015-07-28 21:47:39.000000000 +0200 @@ -177,7 +177,7 @@ } }else if (GEOIP_COUNTRY_EDITION_V6 == i) { country_id = GeoIP_id_by_ipnum_v6(gi, ipnum); - if (country_id < 0 || country_id >= (int) GeoIP_num_countries()) { + if (country_id < 0 || country_id >= (int)GeoIP_num_countries()) { printf("%s: Invalid database\n", GeoIPDBDescription[i]); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GeoIP-1.6.5/configure new/GeoIP-1.6.6/configure --- old/GeoIP-1.6.5/configure 2015-02-25 23:31:06.000000000 +0100 +++ new/GeoIP-1.6.6/configure 2015-07-28 21:50:45.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GeoIP 1.6.5. +# Generated by GNU Autoconf 2.69 for GeoIP 1.6.6. # # Report bugs to <support(a)maxmind.com>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='GeoIP' PACKAGE_TARNAME='GeoIP' -PACKAGE_VERSION='1.6.5' -PACKAGE_STRING='GeoIP 1.6.5' +PACKAGE_VERSION='1.6.6' +PACKAGE_STRING='GeoIP 1.6.6' PACKAGE_BUGREPORT='support(a)maxmind.com' PACKAGE_URL='' @@ -1314,7 +1314,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GeoIP 1.6.5 to adapt to many kinds of systems. +\`configure' configures GeoIP 1.6.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1384,7 +1384,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GeoIP 1.6.5:";; + short | recursive ) echo "Configuration of GeoIP 1.6.6:";; esac cat <<\_ACEOF @@ -1490,7 +1490,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GeoIP configure 1.6.5 +GeoIP configure 1.6.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1967,7 +1967,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GeoIP $as_me 1.6.5, which was +It was created by GeoIP $as_me 1.6.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2835,7 +2835,7 @@ # Define the identity of the package. PACKAGE='GeoIP' - VERSION='1.6.5' + VERSION='1.6.6' cat >>confdefs.h <<_ACEOF @@ -13726,7 +13726,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GeoIP $as_me 1.6.5, which was +This file was extended by GeoIP $as_me 1.6.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13783,7 +13783,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GeoIP config.status 1.6.5 +GeoIP config.status 1.6.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GeoIP-1.6.5/configure.ac new/GeoIP-1.6.6/configure.ac --- old/GeoIP-1.6.5/configure.ac 2015-02-25 23:30:14.000000000 +0100 +++ new/GeoIP-1.6.6/configure.ac 2015-07-28 21:50:30.000000000 +0200 @@ -1,7 +1,7 @@ dnl AM_CONFIG_HEADER(config.h) AC_PREREQ([2.65]) -AC_INIT([GeoIP], [1.6.5],[support(a)maxmind.com],[GeoIP]) +AC_INIT([GeoIP], [1.6.6],[support(a)maxmind.com],[GeoIP]) AC_CONFIG_AUX_DIR([.]) AC_CONFIG_SRCDIR([libGeoIP/GeoIP.c]) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GeoIP-1.6.5/libGeoIP/GeoIP.c new/GeoIP-1.6.6/libGeoIP/GeoIP.c --- old/GeoIP-1.6.5/libGeoIP/GeoIP.c 2015-02-25 23:28:41.000000000 +0100 +++ new/GeoIP-1.6.6/libGeoIP/GeoIP.c 2015-07-28 21:47:40.000000000 +0200 @@ -25,6 +25,17 @@ #if defined(_WIN32) #include <io.h> + +#ifdef _MSC_VER +# if _MSC_VER < 1900 // VS 2015 supports snprintf +# define snprintf _snprintf +# endif +# if _MSC_VER >= 1400 // VS 2005+ deprecates fileno, lseek and read +# define fileno _fileno +# define read _read +# define lseek _lseek +# endif +#endif #else #include <unistd.h> #include <netdb.h> @@ -1060,7 +1071,7 @@ } static -int _check_mtime(GeoIP *gi) +void _check_mtime(GeoIP *gi) { struct stat buf; ssize_t idx_size; @@ -1077,9 +1088,15 @@ #if !defined(_WIN32) /* stat only has second granularity, so don't * call it more than once a second */ - gettimeofday(&t, NULL); + if (0 != gettimeofday(&t, NULL)) { + DEBUG_MSGF(gi->flags, + "Error calling gettimeofday: %s\n", + strerror(errno)); + return; + } + if (t.tv_sec == gi->last_mtime_check) { - return 0; + return; } gi->last_mtime_check = t.tv_sec; @@ -1090,7 +1107,7 @@ GetSystemTimeAsFileTime(&ft); t = FILETIME_TO_USEC(ft) / 1000 / 1000; if (t == gi->last_mtime_check) { - return 0; + return; } gi->last_mtime_check = t; @@ -1120,7 +1137,7 @@ DEBUG_MSGF(gi->flags, "Out of memory when reloading %s\n", gi->file_path); - return -1; + return; } } } @@ -1131,7 +1148,7 @@ DEBUG_MSGF(gi->flags, "Error Opening file %s when reloading\n", gi->file_path); - return -1; + return; } gi->mtime = buf.st_mtime; gi->size = buf.st_size; @@ -1141,7 +1158,7 @@ DEBUG_MSGF(gi->flags, "GEOIP_MMAP_CACHE is not supported on WIN32\n"); gi->cache = 0; - return -1; + return; #else gi->cache = mmap(NULL, buf.st_size, PROT_READ, MAP_PRIVATE, fileno( @@ -1153,7 +1170,7 @@ gi->file_path); gi->cache = NULL; - return -1; + return; } #endif } else if (gi->flags & GEOIP_MEMORY_CACHE) { @@ -1162,7 +1179,7 @@ DEBUG_MSGF(gi->flags, "Error reading file %s when reloading\n", gi->file_path); - return -1; + return; } } @@ -1174,14 +1191,14 @@ if (gi->databaseSegments == NULL) { DEBUG_MSGF(gi->flags, "Error reading file %s -- corrupt\n", gi->file_path); - return -1; + return; } idx_size = get_index_size(gi, &buf); if (idx_size < 0) { DEBUG_MSGF(gi->flags, "Error file %s -- corrupt\n", gi->file_path); - return -1; + return; } if (gi->flags & GEOIP_INDEX_CACHE) { @@ -1194,14 +1211,14 @@ gi->flags, "Error reading file %s where reloading\n", gi->file_path); - return -1; + return; } } } } } } - return 0; + return; } #define ADDR_STR_LEN (8 * 4 + 7 + 1) @@ -1575,6 +1592,9 @@ } else { gi->index_cache = NULL; } + + gi->last_mtime_check = 0; + return gi; } @@ -2678,4 +2698,3 @@ return result; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GeoIP-1.6.5/libGeoIP/GeoIP.h new/GeoIP-1.6.6/libGeoIP/GeoIP.h --- old/GeoIP-1.6.5/libGeoIP/GeoIP.h 2015-02-25 23:28:41.000000000 +0100 +++ new/GeoIP-1.6.6/libGeoIP/GeoIP.h 2015-03-04 17:51:09.000000000 +0100 @@ -33,7 +33,6 @@ #else /* !defined(_WIN32) */ #include <winsock2.h> #include <ws2tcpip.h> -#define snprintf _snprintf #define FILETIME_TO_USEC(ft) \ (((unsigned __int64)ft.dwHighDateTime << 32 | \ ft.dwLowDateTime) / 10) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GeoIP-1.6.5/libGeoIP/GeoIPCity.c new/GeoIP-1.6.6/libGeoIP/GeoIPCity.c --- old/GeoIP-1.6.5/libGeoIP/GeoIPCity.c 2015-01-27 19:42:09.000000000 +0100 +++ new/GeoIP-1.6.6/libGeoIP/GeoIPCity.c 2015-07-13 16:30:10.000000000 +0200 @@ -29,6 +29,12 @@ #else #include <windows.h> #include <winsock.h> + +#if defined(_MSC_VER) && _MSC_VER >= 1400 // VS 2005+ deprecates fileno, lseek and read +# define fileno _fileno +# define read _read +# define lseek _lseek +#endif #endif #include <sys/types.h> /* For uint32_t */ #ifdef HAVE_STDINT_H @@ -90,6 +96,10 @@ return NULL; } }else { + if (gi->size <= record_pointer) { + /* such record does not exists in the cache */ + return NULL; + } record_buf = gi->cache + (long)record_pointer; } @@ -140,14 +150,14 @@ for (j = 0; j < 3; ++j) { latitude += (record_buf[j] << (j * 8)); } - record->latitude = latitude / 10000 - 180; + record->latitude = (float)(latitude / 10000 - 180); record_buf += 3; /* get longitude */ for (j = 0; j < 3; ++j) { longitude += (record_buf[j] << (j * 8)); } - record->longitude = longitude / 10000 - 180; + record->longitude = (float)(longitude / 10000 - 180); /* * get area code and metro code for post April 2002 databases and for US diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GeoIP-1.6.5/ltmain.sh new/GeoIP-1.6.6/ltmain.sh --- old/GeoIP-1.6.5/ltmain.sh 2015-02-25 23:31:03.000000000 +0100 +++ new/GeoIP-1.6.6/ltmain.sh 2015-07-28 21:50:42.000000000 +0200 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.10ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.10ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1.11" TIMESTAMP="" package_revision=1.3337

6 years, 9 months

commit octave-forge-io for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package octave-forge-io for openSUSE:Factory checked in at 2015-09-30 05:53:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave-forge-io (Old) and /work/SRC/openSUSE:Factory/.octave-forge-io.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "octave-forge-io" Changes: -------- --- /work/SRC/openSUSE:Factory/octave-forge-io/octave-forge-io.changes 2015-08-23 15:42:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.octave-forge-io.new/octave-forge-io.changes 2015-09-30 05:53:15.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 28 14:09:10 UTC 2015 - dmitry_r(a)opensuse.org + +- Update to version 2.2.10 + * Support for Named Ranges + * Bug fixes + +------------------------------------------------------------------- Old: ---- io-2.2.9.tar.gz New: ---- io-2.2.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave-forge-io.spec ++++++ --- /var/tmp/diff_new_pack.lv9gb5/_old 2015-09-30 05:53:16.000000000 +0200 +++ /var/tmp/diff_new_pack.lv9gb5/_new 2015-09-30 05:53:16.000000000 +0200 @@ -18,7 +18,7 @@ %define octpkg io Name: octave-forge-%{octpkg} -Version: 2.2.9 +Version: 2.2.10 Release: 0 Summary: Input/Output in external formats from Octave License: GPL-3.0+ and BSD-2-Clause ++++++ io-2.2.9.tar.gz -> io-2.2.10.tar.gz ++++++ ++++ 4706 lines of diff (skipped)

6 years, 9 months

commit ghc-mod for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package ghc-mod for openSUSE:Factory checked in at 2015-09-30 05:53:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-mod (Old) and /work/SRC/openSUSE:Factory/.ghc-mod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-mod" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-mod/ghc-mod.changes 2015-09-08 17:48:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-mod.new/ghc-mod.changes 2015-09-30 05:53:14.000000000 +0200 @@ -1,0 +2,20 @@ +Mon Sep 28 13:57:23 UTC 2015 - mimi.vx(a)gmail.com + +- update to 5.4.0.0 +* Add support for the Stack build tool +* `module not interpreted` errors when using the `type` + command +* support for file redirection +* Add support for file redirection to Emacs frontend so + all commands should work even with unsaved files now! +* Support inserting holes in type signatures +* Fix URL anchors being dropped in OS X +* Fix GHC session always being dropped in interactive mode (caused + super slowness) +* Expose all internal modules because API will get a major + redesign soon anyways +* ghc-mod(i) executable must now be run in project directory for + commands other than `root` +* Add --line-prefix option for multiplexing stdout/err onto one stream + +------------------------------------------------------------------- Old: ---- ghc-mod-5.3.0.0.tar.gz New: ---- ghc-mod-5.4.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-mod.spec ++++++ --- /var/tmp/diff_new_pack.kwT59c/_old 2015-09-30 05:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.kwT59c/_new 2015-09-30 05:53:15.000000000 +0200 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-mod -Version: 5.3.0.0 +Version: 5.4.0.0 Release: 0 Summary: Happy Haskell Programming License: AGPL-3.0+ and BSD-3-Clause @@ -56,6 +56,7 @@ BuildRequires: ghc-monad-journal-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-old-time-devel +BuildRequires: ghc-pipes-devel BuildRequires: ghc-pretty-devel BuildRequires: ghc-process-devel BuildRequires: ghc-split-devel ++++++ ghc-mod-5.3.0.0.tar.gz -> ghc-mod-5.4.0.0.tar.gz ++++++ ++++ 6046 lines of diff (skipped)

6 years, 9 months

commit apache2-mod_wsgi for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package apache2-mod_wsgi for openSUSE:Factory checked in at 2015-09-30 05:53:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2-mod_wsgi (Old) and /work/SRC/openSUSE:Factory/.apache2-mod_wsgi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache2-mod_wsgi" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2-mod_wsgi/apache2-mod_wsgi-python3.changes 2015-08-28 08:26:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache2-mod_wsgi.new/apache2-mod_wsgi-python3.changes 2015-09-30 05:53:11.000000000 +0200 @@ -2 +2,17 @@ -Sat Aug 15 17:56:30 CEST 2015 - mc(a)suse.de +Mon Sep 28 13:33:55 CEST 2015 - mc(a)suse.de + +- update to 4.4.13 + * Upstream release notes: + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.13.html + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.12.html + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.11.html + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.10.html + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.9.html + +------------------------------------------------------------------- +Tue Sep 1 10:06:04 UTC 2015 - pgajdos(a)suse.com + +- test module with %apache_test_module_load + +------------------------------------------------------------------- +Sat Aug 15 17:55:03 CEST 2015 - mc(a)suse.de @@ -4,0 +21,3 @@ + * Upstream release notes: + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.7.html + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.8.html @@ -6 +25 @@ -- conflict with mod_wsgi +- conflict with mod_wsgi-python3 --- /work/SRC/openSUSE:Factory/apache2-mod_wsgi/apache2-mod_wsgi.changes 2015-08-28 08:26:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache2-mod_wsgi.new/apache2-mod_wsgi.changes 2015-09-30 05:53:11.000000000 +0200 @@ -1,0 +2,16 @@ +Mon Sep 28 13:33:55 CEST 2015 - mc(a)suse.de + +- update to 4.4.13 + * Upstream release notes: + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.13.html + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.12.html + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.11.html + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.10.html + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.9.html + +------------------------------------------------------------------- +Tue Sep 1 10:06:04 UTC 2015 - pgajdos(a)suse.com + +- test module with %apache_test_module_load + +------------------------------------------------------------------- Old: ---- mod_wsgi-4.4.8.tar.gz New: ---- mod_wsgi-4.4.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_wsgi-python3.spec ++++++ --- /var/tmp/diff_new_pack.YNTzny/_old 2015-09-30 05:53:12.000000000 +0200 +++ /var/tmp/diff_new_pack.YNTzny/_new 2015-09-30 05:53:12.000000000 +0200 @@ -18,7 +18,7 @@ %define modname mod_wsgi Name: apache2-mod_wsgi-python3 -Version: 4.4.8 +Version: 4.4.13 Release: 0 Summary: A WSGI interface for Python3 web applications in Apache License: Apache-2.0 @@ -75,6 +75,11 @@ %install make install DESTDIR=%{buildroot} LIBEXECDIR=%{apache_libexecdir} +%check +set +x +%apache_test_module_load -m wsgi +set -x + %post %if 0%{?suse_version} if ! %{_sbindir}/a2enmod -q wsgi; then ++++++ apache2-mod_wsgi.spec ++++++ --- /var/tmp/diff_new_pack.YNTzny/_old 2015-09-30 05:53:12.000000000 +0200 +++ /var/tmp/diff_new_pack.YNTzny/_new 2015-09-30 05:53:12.000000000 +0200 @@ -18,7 +18,7 @@ %define modname mod_wsgi Name: apache2-mod_wsgi -Version: 4.4.8 +Version: 4.4.13 Release: 0 Summary: Python WSGI adapter module for Apache License: Apache-2.0 @@ -87,6 +87,11 @@ fi %endif +%check +set +x +%apache_test_module_load -m wsgi +set -x + %files %defattr(-,root,root) %doc LICENSE README.rst docs/release-notes ++++++ mod_wsgi-4.4.8.tar.gz -> mod_wsgi-4.4.13.tar.gz ++++++ ++++ 3695 lines of diff (skipped)

6 years, 9 months

commit ghc-cabal-helper for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package ghc-cabal-helper for openSUSE:Factory checked in at 2015-09-30 05:53:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-cabal-helper (Old) and /work/SRC/openSUSE:Factory/.ghc-cabal-helper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-cabal-helper" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-cabal-helper/ghc-cabal-helper.changes 2015-09-08 17:47:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-cabal-helper.new/ghc-cabal-helper.changes 2015-09-30 05:53:13.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 28 13:52:02 UTC 2015 - mimi.vx(a)gmail.com + +- update to 0.6.0.0 + +------------------------------------------------------------------- Old: ---- cabal-helper-0.5.2.0.tar.gz New: ---- cabal-helper-0.6.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-cabal-helper.spec ++++++ --- /var/tmp/diff_new_pack.27h2vp/_old 2015-09-30 05:53:13.000000000 +0200 +++ /var/tmp/diff_new_pack.27h2vp/_new 2015-09-30 05:53:13.000000000 +0200 @@ -19,7 +19,7 @@ %global pkg_name cabal-helper %bcond_with tests Name: ghc-cabal-helper -Version: 0.5.2.0 +Version: 0.6.0.0 Release: 0 Summary: Simple interface to some of Cabal's configuration state used by ghc-mod License: AGPL-3.0+ ++++++ cabal-helper-0.5.2.0.tar.gz -> cabal-helper-0.6.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.5.2.0/CabalHelper/Common.hs new/cabal-helper-0.6.0.0/CabalHelper/Common.hs --- old/cabal-helper-0.5.2.0/CabalHelper/Common.hs 2015-08-20 04:02:22.000000000 +0200 +++ new/cabal-helper-0.6.0.0/CabalHelper/Common.hs 2015-09-07 08:02:26.000000000 +0200 @@ -30,6 +30,8 @@ import System.Environment import System.IO import System.Exit +import System.Directory +import System.FilePath import Text.ParserCombinators.ReadP import Prelude @@ -48,20 +50,6 @@ prog <- getProgName hPutStrLn stderr $ prog ++ ": " ++ str -align :: String -> String -> String -> String -align n an str = let - h:rest = lines str - [hm] = match n h - rest' = [ move (hm - rm) r | r <- rest, rm <- match an r] - in - unlines (h:rest') - where - match p str' = maybeToList $ - fst <$> find ((p `isPrefixOf`) . snd) ([0..] `zip` tails str') - move i str' | i > 0 = replicate i ' ' ++ str' - move i str' = drop i str' - - -- | @getCabalConfigHeader "dist/setup-config"@ returns the cabal version and -- compiler version getCabalConfigHeader :: FilePath -> IO (Maybe (Version, (ByteString, Version))) @@ -95,3 +83,6 @@ runReadP p i = case filter ((=="") . snd) $ readP_to_S p i of (a,""):[] -> a _ -> error $ "Error parsing: " ++ show i + +appDataDir :: IO FilePath +appDataDir = (</> "cabal-helper") <$> getAppUserDataDirectory "ghc-mod" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.5.2.0/CabalHelper/Compile.hs new/cabal-helper-0.6.0.0/CabalHelper/Compile.hs --- old/cabal-helper-0.5.2.0/CabalHelper/Compile.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/cabal-helper-0.6.0.0/CabalHelper/Compile.hs 2015-09-07 08:02:26.000000000 +0200 @@ -0,0 +1,375 @@ +-- cabal-helper: Simple interface to Cabal's configuration state +-- Copyright (C) 2015 Daniel Gröber <dxld ÄT darkboxed DOT org> +-- +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU Affero General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU Affero General Public License for more details. +-- +-- You should have received a copy of the GNU Affero General Public License +-- along with this program. If not, see <http://www.gnu.org/licenses/>. +{-# LANGUAGE RecordWildCards, FlexibleContexts #-} +module CabalHelper.Compile where + +import Control.Applicative +import Control.Arrow +import Control.Exception as E +import Control.Monad +import Control.Monad.Trans.Maybe +import Control.Monad.IO.Class +import Data.Traversable +import Data.Char +import Data.List +import Data.Maybe +import Data.String +import Data.Version +import Text.Printf +import System.Directory +import System.FilePath +import System.Process +import System.Exit +import System.IO +import Prelude + +import Distribution.System (buildPlatform) +import Distribution.Text (display) + +import Paths_cabal_helper (version) +import CabalHelper.Data +import CabalHelper.Common +import CabalHelper.Sandbox (getSandboxPkgDb) +import CabalHelper.Types +import CabalHelper.Log + +data Compile = Compile { + compCabalHelperSourceDir :: FilePath, + compCabalSourceDir :: Maybe FilePath, + compPackageDb :: Maybe FilePath, + compCabalVersion :: Version, + compPackageDeps :: [String] + } + +compileHelper :: Options -> Version -> FilePath -> FilePath -> IO (Either ExitCode FilePath) +compileHelper opts cabalVer projdir distdir = withHelperSources $ \chdir -> do + case cabalPkgDb opts of + Nothing -> + run [ + -- TODO: here ghc's caching fails and it always recompiles, probably + -- because we write the sources to a tempdir and they always look + -- newer than the Cabal sources, not sure if we can fix this + compileCabalSource chdir + , Right <$> MaybeT (cachedExe cabalVer) + , compileSandbox chdir + , compileGlobal chdir + , cachedCabalPkg chdir + , MaybeT (Just <$> compilePrivatePkgDb chdir) + ] + mdb -> + run [ Right <$> MaybeT (cachedExe cabalVer) + , liftIO $ compileWithPkg chdir mdb cabalVer + ] + + where + run actions = fromJust <$> runMaybeT (msum actions) + + logMsg = "compiling helper with Cabal from " + + +-- for relaxed deps: find (sameMajorVersionAs cabalVer) . reverse . sort + + -- | Check if this version is globally available + compileGlobal :: FilePath -> MaybeT IO (Either ExitCode FilePath) + compileGlobal chdir = do + -- TODO: add option to let user specify custom package-db, relevant when + -- using a Cabal compiled from git! + + ver <- MaybeT $ find (== cabalVer) <$> listCabalVersions opts + vLog opts $ logMsg ++ "user/global package-db" + liftIO $ compileWithPkg chdir Nothing ver + + -- | Check if this version is available in the project sandbox + compileSandbox :: FilePath -> MaybeT IO (Either ExitCode FilePath) + compileSandbox chdir = do + sandbox <- MaybeT $ getSandboxPkgDb projdir (display buildPlatform) =<< ghcVersion opts + ver <- MaybeT $ find (== cabalVer) <$> listCabalVersions' opts (Just sandbox) + vLog opts $ logMsg ++ "sandbox package-db" + liftIO $ compileWithPkg chdir (Just sandbox) ver + + + -- | Check if we already compiled this version of cabal into a private + -- package-db + cachedCabalPkg :: FilePath -> MaybeT IO (Either ExitCode FilePath) + cachedCabalPkg chdir = do + db_exists <- liftIO $ cabalPkgDbExists opts cabalVer + case db_exists of + False -> mzero + True -> do + db <- liftIO $ getPrivateCabalPkgDb opts cabalVer + vLog opts $ logMsg ++ "private package-db in " ++ db + liftIO $ compileWithPkg chdir (Just db) cabalVer + + -- | See if we're in a cabal source tree + compileCabalSource :: FilePath -> MaybeT IO (Either ExitCode FilePath) + compileCabalSource chdir = do + let cabalFile = projdir </> "Cabal.cabal" + isCabalMagicVer = cabalVer == Version [1,9999] [] + cabalSrc <- liftIO $ doesFileExist cabalFile + + when isCabalMagicVer $ + vLog opts $ "cabal magic version (1.9999) found" + + when cabalSrc $ + vLog opts $ "directory above distdir looks like cabal source tree (Cabal.cabal exists)" + + case isCabalMagicVer || cabalSrc of + False -> mzero + True -> liftIO $ do + ver <- cabalFileVersion <$> readFile cabalFile + vLog opts $ "compiling helper with local Cabal source tree" + compileWithCabalTree chdir ver projdir + + -- | Compile the requested cabal version into an isolated package-db + compilePrivatePkgDb :: FilePath -> IO (Either ExitCode FilePath) + compilePrivatePkgDb chdir = do + db <- installCabal opts cabalVer `E.catch` + \(SomeException _) -> errorInstallCabal cabalVer distdir + compileWithPkg chdir (Just db) cabalVer + + compileWithCabalTree chdir ver srcDir = + compile distdir opts $ Compile chdir (Just srcDir) Nothing ver [] + + compileWithPkg chdir mdb ver = + compile distdir opts $ Compile chdir Nothing mdb ver [cabalPkgId ver] + + cabalPkgId v = "Cabal-" ++ showVersion v + +compile :: FilePath -> Options -> Compile -> IO (Either ExitCode FilePath) +compile distdir opts@Options {..} Compile {..} = do + cCabalSourceDir <- canonicalizePath `traverse` compCabalSourceDir + appdir <- appDataDir + + let outdir' = maybe appdir (const $ distdir </> "cabal-helper") cCabalSourceDir + createDirectoryIfMissing True outdir' + outdir <- canonicalizePath outdir' + + let exedir' = maybe outdir (const distdir) cCabalSourceDir + createDirectoryIfMissing True exedir' + exedir <- canonicalizePath exedir' + exe <- exePath' compCabalVersion <$> canonicalizePath exedir + + vLog opts $ "outdir: " ++ outdir + vLog opts $ "exedir: " ++ exedir + + let Version (mj:mi:_) _ = compCabalVersion + let ghc_opts = + concat [ + [ "-outputdir", outdir + , "-o", exe + , "-optP-DCABAL_HELPER=1" + , "-optP-DCABAL_MAJOR=" ++ show mj + , "-optP-DCABAL_MINOR=" ++ show mi + ], + maybeToList $ ("-package-conf="++) <$> compPackageDb, + map ("-i"++) $ nub $ ".":maybeToList cCabalSourceDir, + + if isNothing cCabalSourceDir + then [ "-hide-all-packages" + , "-package", "base" + , "-package", "containers" + , "-package", "directory" + , "-package", "filepath" + , "-package", "process" + , "-package", "bytestring" + , "-package", "ghc-prim" + ] + else [], + + concatMap (\p -> ["-package", p]) compPackageDeps, + [ "--make", "CabalHelper/Main.hs" ] + ] + + vLog opts $ intercalate " " $ map (("\""++) . (++"\"")) $ ghcProgram:ghc_opts + + -- TODO: touch exe after, ghc doesn't do that if the input files didn't + -- actually change + rv <- callProcessStderr' (Just compCabalHelperSourceDir) ghcProgram ghc_opts + return $ case rv of + ExitSuccess -> Right exe + e@(ExitFailure _) -> Left e + +exePath :: Version -> IO FilePath +exePath compCabalVersion = do + exePath' compCabalVersion <$> appDataDir + +exePath' :: Version-> FilePath -> FilePath +exePath' compCabalVersion outdir = + outdir </> "cabal-helper-" ++ showVersion version -- our ver + ++ "-Cabal-" ++ showVersion compCabalVersion + +callProcessStderr' :: Maybe FilePath -> FilePath -> [String] -> IO ExitCode +callProcessStderr' mwd exe args = do + (_, _, _, h) <- createProcess (proc exe args) { std_out = UseHandle stderr + , cwd = mwd } + waitForProcess h + +callProcessStderr :: Maybe FilePath -> FilePath -> [String] -> IO () +callProcessStderr mwd exe args = do + rv <- callProcessStderr' mwd exe args + case rv of + ExitSuccess -> return () + ExitFailure v -> processFailedException "callProcessStderr" exe args v + +processFailedException :: String -> String -> [String] -> Int -> IO a +processFailedException fn exe args rv = + panic $ concat [fn, ": ", exe, " " + , intercalate " " (map show args) + , " (exit " ++ show rv ++ ")"] + +installCabal :: Options -> Version -> IO FilePath +installCabal opts ver = do + appdir <- appDataDir + let sver = showVersion ver + hPutStr stderr $ printf "\ +\cabal-helper-wrapper: Installing a private copy of Cabal because we couldn't\n\ +\find the right version in your global/user package-db, this might take a\n\ +\while but will only happen once per Cabal version you're using.\n\ +\\n\ +\If anything goes horribly wrong just delete this directory and try again:\n\ +\ %s\n\ +\\n\ +\If you want to avoid this automatic installation altogether install\n\ +\version %s of Cabal manually (into your user or global package-db):\n\ +\ $ cabal install Cabal --constraint \"Cabal == %s\"\n\ +\\n\ +\Installing Cabal %s ...\n" appdir sver sver sver + + db <- createPkgDb opts ver + cabalInstallVer <- cabalInstallVersion opts + cabal_opts <- return $ concat + [ + [ "--package-db=clear" + , "--package-db=global" + , "--package-db=" ++ db + , "--prefix=" ++ db </> "prefix" + , "--with-ghc=" ++ ghcProgram opts + ] + , if cabalInstallVer >= Version [1,20,0,0] [] + then ["--no-require-sandbox"] + else [] + , if ghcPkgProgram opts /= ghcPkgProgram defaultOptions + then [ "--with-ghc-pkg=" ++ ghcPkgProgram opts ] + else [] + , [ "install", "Cabal", "--constraint" + , "Cabal == " ++ showVersion ver ] + ] + + vLog opts $ intercalate " " $ map (("\""++) . (++"\"")) $ cabalProgram opts:cabal_opts + + callProcessStderr (Just "/") (cabalProgram opts) cabal_opts + hPutStrLn stderr "done" + return db + +errorInstallCabal :: Version -> FilePath -> a +errorInstallCabal cabalVer _distdir = panic $ printf "\ +\Installing Cabal version %s failed.\n\ +\\n\ +\You have the following choices to fix this:\n\ +\\n\ +\- The easiest way to try and fix this is just reconfigure the project and try\n\ +\ again:\n\ +\ $ cabal clean && cabal configure\n\ +\\n\ +\- If that fails you can try to install the version of Cabal mentioned above\n\ +\ into your global/user package-db somehow, you'll probably have to fix\n\ +\ something otherwise it wouldn't have failed above:\n\ +\ $ cabal install Cabal --constraint 'Cabal == %s'\n\ +\\n\ +\- If you're using `Build-Type: Simple`:\n\ +\ - You can see if you can reinstall your cabal-install executable while\n\ +\ having it linked to a version of Cabal that's available in you\n\ +\ package-dbs or can be built automatically:\n\ +\ $ ghc-pkg list | grep Cabal # find an available Cabal version\n\ +\ Cabal-W.X.Y.Z\n\ +\ $ cabal install cabal-install --constraint 'Cabal == W.X.*'\n\ +\ Afterwards you'll have to reconfigure your project:\n\ +\ $ cabal clean && cabal configure\n\ +\\n\ +\- If you're using `Build-Type: Custom`:\n\ +\ - Have cabal-install rebuild your Setup.hs executable with a version of the\n\ +\ Cabal library that you have available in your global/user package-db:\n\ +\ $ cabal clean && cabal configure\n\ +\ You might also have to install some version of the Cabal to do this:\n\ +\ $ cabal install Cabal\n\ +\\n" sver sver + where + sver = showVersion cabalVer + +cachedExe :: Version -> IO (Maybe FilePath) +cachedExe compCabalVersion = do + exe <- exePath compCabalVersion + exists <- doesFileExist exe + return $ if exists then Just exe else Nothing + +listCabalVersions :: Options -> IO [Version] +listCabalVersions opts = listCabalVersions' opts Nothing + +-- TODO: Include sandbox? Probably only relevant for build-type:custom projects. +listCabalVersions' :: Options -> Maybe FilePath -> IO [Version] +listCabalVersions' Options {..} mdb = do + let mdbopt = ("--package-conf="++) <$> mdb + opts = ["list", "--simple-output", "Cabal"] ++ maybeToList mdbopt + + catMaybes . map (fmap snd . parsePkgId . fromString) . words + <$> readProcess ghcPkgProgram opts "" + +cabalPkgDbExists :: Options -> Version -> IO Bool +cabalPkgDbExists opts ver = do + db <- getPrivateCabalPkgDb opts ver + dexists <- doesDirectoryExist db + case dexists of + False -> return False + True -> do + vers <- listCabalVersions' opts (Just db) + return $ ver `elem` vers + + +ghcVersion :: Options -> IO Version +ghcVersion Options {..} = do + parseVer . trim <$> readProcess ghcProgram ["--numeric-version"] "" + +ghcPkgVersion :: Options -> IO Version +ghcPkgVersion Options {..} = do + parseVer . trim . dropWhile (not . isDigit) <$> readProcess ghcPkgProgram ["--version"] "" + +cabalInstallVersion :: Options -> IO Version +cabalInstallVersion Options {..} = do + parseVer . trim <$> readProcess cabalProgram ["--numeric-version"] "" + +trim :: String -> String +trim = dropWhileEnd isSpace + +createPkgDb :: Options -> Version -> IO FilePath +createPkgDb opts@Options {..} ver = do + db <- getPrivateCabalPkgDb opts ver + exists <- doesDirectoryExist db + when (not exists) $ callProcessStderr Nothing ghcPkgProgram ["init", db] + return db + +getPrivateCabalPkgDb :: Options -> Version -> IO FilePath +getPrivateCabalPkgDb opts ver = do + appdir <- appDataDir + ghcVer <- ghcVersion opts + return $ appdir </> "Cabal-" ++ showVersion ver ++ "-db-" ++ showVersion ghcVer + +-- | Find @version: XXX@ delcaration in a cabal file +cabalFileVersion :: String -> Version +cabalFileVersion cabalFile = + fromJust $ parseVer . extract <$> find ("version:" `isPrefixOf`) ls + where + ls = map (map toLower) $ lines cabalFile + extract = dropWhile (/=':') >>> drop 1 >>> dropWhile isSpace >>> takeWhile (not . isSpace) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.5.2.0/CabalHelper/Data.hs new/cabal-helper-0.6.0.0/CabalHelper/Data.hs --- old/cabal-helper-0.5.2.0/CabalHelper/Data.hs 2015-08-20 04:02:22.000000000 +0200 +++ new/cabal-helper-0.6.0.0/CabalHelper/Data.hs 2015-09-07 08:02:26.000000000 +0200 @@ -41,5 +41,6 @@ [ ("Main.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "CabalHelper/Main.hs"))) , ("Common.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "CabalHelper/Common.hs"))) , ("Sandbox.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "CabalHelper/Sandbox.hs"))) + , ("Licenses.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "CabalHelper/Licenses.hs"))) , ("Types.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "CabalHelper/Types.hs"))) ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.5.2.0/CabalHelper/Licenses.hs new/cabal-helper-0.6.0.0/CabalHelper/Licenses.hs --- old/cabal-helper-0.5.2.0/CabalHelper/Licenses.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/cabal-helper-0.6.0.0/CabalHelper/Licenses.hs 2015-09-07 08:02:26.000000000 +0200 @@ -0,0 +1,102 @@ +{-# LANGUAGE CPP #-} +module CabalHelper.Licenses where + +-- Copyright (c) 2014, Jasper Van der Jeugt <m(a)jaspervdj.be> + +-------------------------------------------------------------------------------- +import Control.Arrow ((***), (&&&)) +import Control.Monad (forM_, unless) +import Data.List (foldl', sort) +import Data.Maybe (catMaybes) +import Data.Version (Version) +import Data.Set (Set) +import qualified Data.Set as Set +import Distribution.InstalledPackageInfo (InstalledPackageInfo) +import qualified Distribution.InstalledPackageInfo as InstalledPackageInfo +import qualified Distribution.License as Cabal +import qualified Distribution.Package as Cabal +import qualified Distribution.Simple.Configure as Cabal +import qualified Distribution.Simple.LocalBuildInfo as Cabal +import qualified Distribution.Simple.PackageIndex as Cabal +import qualified Distribution.Text as Cabal +import System.Directory (getDirectoryContents) +import System.Exit (exitFailure) +import System.FilePath (takeExtension) +import System.IO (hPutStrLn, stderr) + +-------------------------------------------------------------------------------- + +#if CABAL_MAJOR == 1 && CABAL_MINOR > 22 +type PackageIndex a = Cabal.PackageIndex (InstalledPackageInfo.InstalledPackageInfo) +#elif CABAL_MAJOR == 1 && CABAL_MINOR >= 22 +type PackageIndex a = Cabal.PackageIndex (InstalledPackageInfo.InstalledPackageInfo_ a) +#else +type PackageIndex a = Cabal.PackageIndex +#endif + +findTransitiveDependencies + :: PackageIndex a + -> Set Cabal.InstalledPackageId + -> Set Cabal.InstalledPackageId +findTransitiveDependencies pkgIdx set0 = go Set.empty (Set.toList set0) + where + go set [] = set + go set (q : queue) + | q `Set.member` set = go set queue + | otherwise = + case Cabal.lookupInstalledPackageId pkgIdx q of + Nothing -> + -- Not found can mean that the package still needs to be + -- installed (e.g. a component of the target cabal package). + -- We can ignore those. + go set queue + Just ipi -> + go (Set.insert q set) + (InstalledPackageInfo.depends ipi ++ queue) + + +-------------------------------------------------------------------------------- +getDependencyInstalledPackageIds + :: Cabal.LocalBuildInfo -> Set Cabal.InstalledPackageId +getDependencyInstalledPackageIds lbi = + findTransitiveDependencies (Cabal.installedPkgs lbi) $ + Set.fromList $ map fst $ Cabal.externalPackageDeps lbi + +-------------------------------------------------------------------------------- +getDependencyInstalledPackageInfos + :: Cabal.LocalBuildInfo -> [InstalledPackageInfo] +getDependencyInstalledPackageInfos lbi = catMaybes $ + map (Cabal.lookupInstalledPackageId pkgIdx) $ + Set.toList (getDependencyInstalledPackageIds lbi) + where + pkgIdx = Cabal.installedPkgs lbi + + +-------------------------------------------------------------------------------- +groupByLicense + :: [InstalledPackageInfo] + -> [(Cabal.License, [InstalledPackageInfo])] +groupByLicense = foldl' + (\assoc ipi -> insert (InstalledPackageInfo.license ipi) ipi assoc) [] + where + -- 'Cabal.License' doesn't have an 'Ord' instance so we need to use an + -- association list instead of 'Map'. The number of licenses probably won't + -- exceed 100 so I think we're alright. + insert :: Eq k => k -> v -> [(k, [v])] -> [(k, [v])] + insert k v [] = [(k, [v])] + insert k v ((k', vs) : kvs) + | k == k' = (k, v : vs) : kvs + | otherwise = (k', vs) : insert k v kvs + + +-------------------------------------------------------------------------------- +displayDependencyLicenseList + :: [(Cabal.License, [InstalledPackageInfo])] + -> [(String, [(String, Version)])] +displayDependencyLicenseList = + map (Cabal.display *** map (getName &&& getVersion)) + where + getName = + Cabal.display . Cabal.pkgName . InstalledPackageInfo.sourcePackageId + getVersion = + Cabal.pkgVersion . InstalledPackageInfo.sourcePackageId diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.5.2.0/CabalHelper/Log.hs new/cabal-helper-0.6.0.0/CabalHelper/Log.hs --- old/cabal-helper-0.5.2.0/CabalHelper/Log.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/cabal-helper-0.6.0.0/CabalHelper/Log.hs 2015-09-07 08:02:26.000000000 +0200 @@ -0,0 +1,14 @@ +module CabalHelper.Log where + +import Control.Monad +import Control.Monad.IO.Class +import Data.String +import System.IO +import Prelude + +import CabalHelper.Types + +vLog :: MonadIO m => Options -> String -> m () +vLog Options { verbose = True } msg = + liftIO $ hPutStrLn stderr msg +vLog _ _ = return () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.5.2.0/CabalHelper/Main.hs new/cabal-helper-0.6.0.0/CabalHelper/Main.hs --- old/cabal-helper-0.5.2.0/CabalHelper/Main.hs 2015-08-20 04:02:22.000000000 +0200 +++ new/cabal-helper-0.6.0.0/CabalHelper/Main.hs 2015-09-07 08:02:26.000000000 +0200 @@ -79,28 +79,31 @@ import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO) import Text.Printf +import CabalHelper.Licenses import CabalHelper.Sandbox import CabalHelper.Common -import CabalHelper.Types +import CabalHelper.Types hiding (Options(..)) usage = do prog <- getProgName - hPutStr stderr $ align "(" "|" ("Usage: " ++ prog ++ " " ++ usageMsg) + hPutStr stderr $ "Usage: " ++ prog ++ " " ++ usageMsg where usageMsg = "" - ++"DIST_DIR ( version\n" - ++" | print-lbi [--human]\n" - ++" | write-autogen-files\n" - ++" | compiler-version\n" - ++" | ghc-options [--with-inplace]\n" - ++" | ghc-src-options [--with-inplace]\n" - ++" | ghc-pkg-options [--with-inplace]\n" - ++" | ghc-merged-pkg-options [--with-inplace]\n" - ++" | ghc-lang-options [--with-inplace]\n" - ++" | package-db-stack\n" - ++" | entrypoints\n" - ++" | source-dirs\n" - ++" ) ...\n" + ++"PROJ_DIR DIST_DIR [--with-* ...] (\n" + ++" version\n" + ++" | print-lbi [--human]\n" + ++" | write-autogen-files\n" + ++" | compiler-version\n" + ++" | ghc-options [--with-inplace]\n" + ++" | ghc-src-options [--with-inplace]\n" + ++" | ghc-pkg-options [--with-inplace]\n" + ++" | ghc-merged-pkg-options [--with-inplace]\n" + ++" | ghc-lang-options [--with-inplace]\n" + ++" | package-db-stack\n" + ++" | entrypoints\n" + ++" | source-dirs\n" + ++" | licenses\n" + ++" ) ...\n" commands :: [String] commands = [ "print-bli" @@ -112,7 +115,8 @@ , "ghc-lang-options" , "package-db-stack" , "entrypoints" - , "source-dirs"] + , "source-dirs" + , "licenses"] main :: IO () main = do @@ -201,10 +205,9 @@ ghcOptPackages = ghcOptPackages opts }) - let res' = res { ghcOptPackageDBs = withPackageDB lbi - , ghcOptHideAllPackages = Flag True - , ghcOptPackages = nub $ ghcOptPackages res - } + let res' = nubPackageFlags $ res { ghcOptPackageDBs = withPackageDB lbi + , ghcOptHideAllPackages = Flag True + } Just . ChResponseList <$> renderGhcOptions' lbi v res' @@ -239,6 +242,10 @@ res <- componentsMap lbi v distdir $$ \_ _ bi -> return $ hsSourceDirs bi return $ Just $ ChResponseCompList (res ++ [(ChSetupHsName, [])]) + "licenses":[] -> do + return $ Just $ ChResponseLicenses $ + displayDependencyLicenseList $ groupByLicense $ getDependencyInstalledPackageInfos lbi + "print-lbi":flags -> case flags of ["--human"] -> print lbi >> return Nothing @@ -375,7 +382,12 @@ isInplaceDep :: (InstalledPackageId, PackageId) -> Bool isInplaceDep (ipid, pid) = inplacePackageId pid == ipid +#if CABAL_MAJOR == 1 && CABAL_MINOR >= 22 +-- >= 1.22 uses NubListR +nubPackageFlags opts = opts +#else nubPackageFlags opts = opts { ghcOptPackages = nub $ ghcOptPackages opts } +#endif renderGhcOptions' lbi v opts = do #if CABAL_MAJOR == 1 && CABAL_MINOR < 20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.5.2.0/CabalHelper/Types.hs new/cabal-helper-0.6.0.0/CabalHelper/Types.hs --- old/cabal-helper-0.5.2.0/CabalHelper/Types.hs 2015-08-20 04:02:22.000000000 +0200 +++ new/cabal-helper-0.6.0.0/CabalHelper/Types.hs 2015-09-07 08:02:26.000000000 +0200 @@ -37,6 +37,7 @@ | ChResponsePkgDbs [ChPkgDb] | ChResponseLbi String | ChResponseVersion String Version + | ChResponseLicenses [(String, [(String, Version)])] deriving (Eq, Ord, Read, Show, Generic) data ChEntrypoint = ChSetupEntrypoint -- ^ Almost like 'ChExeEntrypoint' but @@ -55,3 +56,15 @@ | ChPkgUser | ChPkgSpecific FilePath deriving (Eq, Ord, Read, Show, Generic) + +data Options = Options { + verbose :: Bool + , ghcProgram :: FilePath + , ghcPkgProgram :: FilePath + , cabalProgram :: FilePath + , cabalVersion :: Maybe Version + , cabalPkgDb :: Maybe FilePath +} + +defaultOptions :: Options +defaultOptions = Options False "ghc" "ghc-pkg" "cabal" Nothing Nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.5.2.0/CabalHelper/Wrapper.hs new/cabal-helper-0.6.0.0/CabalHelper/Wrapper.hs --- old/cabal-helper-0.5.2.0/CabalHelper/Wrapper.hs 2015-08-20 04:02:22.000000000 +0200 +++ new/cabal-helper-0.6.0.0/CabalHelper/Wrapper.hs 2015-09-07 08:02:26.000000000 +0200 @@ -13,17 +13,11 @@ -- -- You should have received a copy of the GNU Affero General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. - {-# LANGUAGE RecordWildCards, FlexibleContexts #-} module Main where import Control.Applicative -import Control.Arrow -import Control.Exception as E import Control.Monad -import Control.Monad.Trans.Maybe -import Control.Monad.IO.Class -import Data.Traversable import Data.Char import Data.List import Data.Maybe @@ -43,15 +37,15 @@ import Distribution.Text (display) import Paths_cabal_helper (version) -import CabalHelper.Data import CabalHelper.Common import CabalHelper.GuessGhc -import CabalHelper.Sandbox (getSandboxPkgDb) +import CabalHelper.Compile +import CabalHelper.Types usage :: IO () usage = do prog <- getProgName - hPutStr stderr $ align "(" "|" ("Usage: " ++ prog ++ " " ++ usageMsg) + hPutStr stderr $ "Usage: " ++ prog ++ " " ++ usageMsg where usageMsg = "\ \( print-appdatadir\n\ @@ -60,18 +54,10 @@ \ [--with-ghc=GHC_PATH]\n\ \ [--with-ghc-pkg=GHC_PKG_PATH]\n\ \ [--with-cabal=CABAL_PATH]\n\ +\ [--with-cabal-version=VERSION]\n\ +\ [--with-cabal-pkg-db=PKG_DB]\n\ \ PROJ_DIR DIST_DIR ( print-exe | [CABAL_HELPER_ARGS...] ) )\n" -data Options = Options { - verbose :: Bool - , ghcProgram :: FilePath - , ghcPkgProgram :: FilePath - , cabalProgram :: FilePath -} - -defaultOptions :: Options -defaultOptions = Options False "ghc" "ghc-pkg" "cabal" - globalArgSpec :: [OptDescr (Options -> Options)] globalArgSpec = [ option "" ["verbose"] "Be more verbose" $ @@ -85,6 +71,13 @@ , option "" ["with-cabal"] "cabal-install executable to use" $ reqArg "PROG" $ \p o -> o { cabalProgram = p } + + , option "" ["with-cabal-version"] "Cabal library version to use" $ + reqArg "VERSION" $ \p o -> o { cabalVersion = Just $ parseVer p } + + , option "" ["with-cabal-pkg-db"] "package database to look for Cabal library in" $ + reqArg "PKG_DB" $ \p o -> o { cabalPkgDb = Just p } + ] where option :: [Char] -> [String] -> String -> ArgDescr a -> OptDescr a @@ -132,342 +125,18 @@ \- Check first line of: %s\n\ \- Maybe try: $ cabal configure" cfgf Just (hdrCabalVersion, _) -> do - eexe <- compileHelper opts hdrCabalVersion projdir distdir - case eexe of - Left e -> exitWith e - Right exe -> - case args' of - "print-exe":_ -> putStrLn exe - _ -> do - (_,_,_,h) <- createProcess $ proc exe args - exitWith =<< waitForProcess h + case cabalVersion opts of + Just ver | hdrCabalVersion /= ver -> panic $ printf "\ +\Cabal version %s was requested setup configuration was\n\ +\written by version %s" (showVersion ver) (showVersion hdrCabalVersion) + _ -> do + eexe <- compileHelper opts hdrCabalVersion projdir distdir + case eexe of + Left e -> exitWith e + Right exe -> + case args' of + "print-exe":_ -> putStrLn exe + _ -> do + (_,_,_,h) <- createProcess $ proc exe args + exitWith =<< waitForProcess h _ -> error "invalid command line" - -appDataDir :: IO FilePath -appDataDir = (</> "cabal-helper") <$> getAppUserDataDirectory "ghc-mod" - -compileHelper :: Options -> Version -> FilePath -> FilePath -> IO (Either ExitCode FilePath) -compileHelper opts cabalVer projdir distdir = withHelperSources $ \chdir -> do - run [ compileCabalSource chdir -- TODO: here ghc's caching fails and it always - -- recompiles, probably because we write the - -- sources to a tempdir and they always look - -- newer than the Cabal sources, not sure if we - -- can fix this - , Right <$> MaybeT (cachedExe cabalVer) - , compileSandbox chdir - , compileGlobal chdir - , cachedCabalPkg chdir - , MaybeT (Just <$> compilePrivatePkgDb chdir) - ] - - where - run actions = fromJust <$> runMaybeT (msum actions) - - logMsg = "compiling helper with Cabal from " - - --- for relaxed deps: find (sameMajorVersionAs cabalVer) . reverse . sort - - -- | Check if this version is globally available - compileGlobal :: FilePath -> MaybeT IO (Either ExitCode FilePath) - compileGlobal chdir = do - -- TODO: add option to let user specify custom package-db, relevant when - -- using a Cabal compiled from git! - - ver <- MaybeT $ find (== cabalVer) <$> listCabalVersions opts - vLog opts $ logMsg ++ "user/global package-db" - liftIO $ compileWithPkg chdir Nothing ver - - -- | Check if this version is available in the project sandbox - compileSandbox :: FilePath -> MaybeT IO (Either ExitCode FilePath) - compileSandbox chdir = do - sandbox <- MaybeT $ getSandboxPkgDb projdir (display buildPlatform) =<< ghcVersion opts - ver <- MaybeT $ find (== cabalVer) <$> listCabalVersions' opts (Just sandbox) - vLog opts $ logMsg ++ "sandbox package-db" - liftIO $ compileWithPkg chdir (Just sandbox) ver - - - -- | Check if we already compiled this version of cabal into a private - -- package-db - cachedCabalPkg :: FilePath -> MaybeT IO (Either ExitCode FilePath) - cachedCabalPkg chdir = do - db_exists <- liftIO $ cabalPkgDbExists opts cabalVer - case db_exists of - False -> mzero - True -> do - db <- liftIO $ cabalPkgDb opts cabalVer - vLog opts $ logMsg ++ "private package-db in " ++ db - liftIO $ compileWithPkg chdir (Just db) cabalVer - - -- | See if we're in a cabal source tree - compileCabalSource :: FilePath -> MaybeT IO (Either ExitCode FilePath) - compileCabalSource chdir = do - let cabalFile = projdir </> "Cabal.cabal" - isCabalMagicVer = cabalVer == Version [1,9999] [] - cabalSrc <- liftIO $ doesFileExist cabalFile - - when isCabalMagicVer $ - vLog opts $ "cabal magic version (1.9999) found" - - when cabalSrc $ - vLog opts $ "directory above distdir looks like cabal source tree (Cabal.cabal exists)" - - case isCabalMagicVer || cabalSrc of - False -> mzero - True -> liftIO $ do - ver <- cabalFileVersion <$> readFile cabalFile - vLog opts $ "compiling helper with local Cabal source tree" - compileWithCabalTree chdir ver projdir - - -- | Compile the requested cabal version into an isolated package-db - compilePrivatePkgDb :: FilePath -> IO (Either ExitCode FilePath) - compilePrivatePkgDb chdir = do - db <- installCabal opts cabalVer `E.catch` - \(SomeException _) -> errorInstallCabal cabalVer distdir - compileWithPkg chdir (Just db) cabalVer - - compileWithCabalTree chdir ver srcDir = - compile distdir opts $ Compile chdir (Just srcDir) Nothing ver [] - - compileWithPkg chdir mdb ver = - compile distdir opts $ Compile chdir Nothing mdb ver [cabalPkgId ver] - - cabalPkgId v = "Cabal-" ++ showVersion v - -errorInstallCabal :: Version -> FilePath -> a -errorInstallCabal cabalVer _distdir = panic $ printf "\ -\Installing Cabal version %s failed.\n\ -\\n\ -\You have the following choices to fix this:\n\ -\\n\ -\- The easiest way to try and fix this is just reconfigure the project and try\n\ -\ again:\n\ -\ $ cabal clean && cabal configure\n\ -\\n\ -\- If that fails you can try to install the version of Cabal mentioned above\n\ -\ into your global/user package-db somehow, you'll probably have to fix\n\ -\ something otherwise it wouldn't have failed above:\n\ -\ $ cabal install Cabal --constraint 'Cabal == %s'\n\ -\\n\ -\- If you're using `Build-Type: Simple`:\n\ -\ - You can see if you can reinstall your cabal-install executable while\n\ -\ having it linked to a version of Cabal that's available in you\n\ -\ package-dbs or can be built automatically:\n\ -\ $ ghc-pkg list | grep Cabal # find an available Cabal version\n\ -\ Cabal-W.X.Y.Z\n\ -\ $ cabal install cabal-install --constraint 'Cabal == W.X.*'\n\ -\ Afterwards you'll have to reconfigure your project:\n\ -\ $ cabal clean && cabal configure\n\ -\\n\ -\- If you're using `Build-Type: Custom`:\n\ -\ - Have cabal-install rebuild your Setup.hs executable with a version of the\n\ -\ Cabal library that you have available in your global/user package-db:\n\ -\ $ cabal clean && cabal configure\n\ -\ You might also have to install some version of the Cabal to do this:\n\ -\ $ cabal install Cabal\n\ -\\n" sver sver - where - sver = showVersion cabalVer - - -data Compile = Compile { - cabalHelperSourceDir :: FilePath, - cabalSourceDir :: Maybe FilePath, - packageDb :: Maybe FilePath, - cabalVersion :: Version, - packageDeps :: [String] - } - -compile :: FilePath -> Options -> Compile -> IO (Either ExitCode FilePath) -compile distdir opts@Options {..} Compile {..} = do - cCabalSourceDir <- canonicalizePath `traverse` cabalSourceDir - appdir <- appDataDir - - let outdir' = maybe appdir (const $ distdir </> "cabal-helper") cCabalSourceDir - createDirectoryIfMissing True outdir' - outdir <- canonicalizePath outdir' - - let exedir' = maybe outdir (const distdir) cCabalSourceDir - createDirectoryIfMissing True exedir' - exedir <- canonicalizePath exedir' - exe <- exePath' cabalVersion <$> canonicalizePath exedir - - vLog opts $ "outdir: " ++ outdir - vLog opts $ "exedir: " ++ exedir - - let Version (mj:mi:_) _ = cabalVersion - let ghc_opts = - concat [ - [ "-outputdir", outdir - , "-o", exe - , "-optP-DCABAL_HELPER=1" - , "-optP-DCABAL_MAJOR=" ++ show mj - , "-optP-DCABAL_MINOR=" ++ show mi - ], - maybeToList $ ("-package-conf="++) <$> packageDb, - map ("-i"++) $ nub $ ".":maybeToList cCabalSourceDir, - - if isNothing cCabalSourceDir - then [ "-hide-all-packages" - , "-package", "base" - , "-package", "directory" - , "-package", "filepath" - , "-package", "process" - , "-package", "bytestring" - , "-package", "ghc-prim" - ] - else [], - - concatMap (\p -> ["-package", p]) packageDeps, - [ "--make", "CabalHelper/Main.hs" ] - ] - - vLog opts $ intercalate " " $ map (("\""++) . (++"\"")) $ ghcProgram:ghc_opts - - -- TODO: touch exe after, ghc doesn't do that if the input files didn't - -- actually change - rv <- callProcessStderr' (Just cabalHelperSourceDir) ghcProgram ghc_opts - return $ case rv of - ExitSuccess -> Right exe - e@(ExitFailure _) -> Left e - -exePath :: Version -> IO FilePath -exePath cabalVersion = do - exePath' cabalVersion <$> appDataDir - -exePath' :: Version-> FilePath -> FilePath -exePath' cabalVersion outdir = - outdir </> "cabal-helper-" ++ showVersion version -- our ver - ++ "-Cabal-" ++ showVersion cabalVersion - -cachedExe :: Version -> IO (Maybe FilePath) -cachedExe cabalVersion = do - exe <- exePath cabalVersion - exists <- doesFileExist exe - return $ if exists then Just exe else Nothing - -callProcessStderr' :: Maybe FilePath -> FilePath -> [String] -> IO ExitCode -callProcessStderr' mwd exe args = do - (_, _, _, h) <- createProcess (proc exe args) { std_out = UseHandle stderr - , cwd = mwd } - waitForProcess h - -callProcessStderr :: Maybe FilePath -> FilePath -> [String] -> IO () -callProcessStderr mwd exe args = do - rv <- callProcessStderr' mwd exe args - case rv of - ExitSuccess -> return () - ExitFailure v -> processFailedException "callProcessStderr" exe args v - -processFailedException :: String -> String -> [String] -> Int -> IO a -processFailedException fn exe args rv = - panic $ concat [fn, ": ", exe, " " - , intercalate " " (map show args) - , " (exit " ++ show rv ++ ")"] - -installCabal :: Options -> Version -> IO FilePath -installCabal opts ver = do - appdir <- appDataDir - let sver = showVersion ver - hPutStr stderr $ printf "\ -\cabal-helper-wrapper: Installing a private copy of Cabal because we couldn't\n\ -\find the right version in your global/user package-db, this might take a\n\ -\while but will only happen once per Cabal version you're using.\n\ -\\n\ -\If anything goes horribly wrong just delete this directory and try again:\n\ -\ %s\n\ -\\n\ -\If you want to avoid this automatic installation altogether install\n\ -\version %s of Cabal manually (into your user or global package-db):\n\ -\ $ cabal install Cabal --constraint \"Cabal == %s\"\n\ -\\n\ -\Installing Cabal %s ...\n" appdir sver sver sver - - db <- createPkgDb opts ver - cabalInstallVer <- cabalInstallVersion opts - cabal_opts <- return $ concat - [ - [ "--package-db=clear" - , "--package-db=global" - , "--package-db=" ++ db - , "--prefix=" ++ db </> "prefix" - , "--with-ghc=" ++ ghcProgram opts - ] - , if cabalInstallVer >= Version [1,20,0,0] [] - then ["--no-require-sandbox"] - else [] - , if ghcPkgProgram opts /= ghcPkgProgram defaultOptions - then [ "--with-ghc-pkg=" ++ ghcPkgProgram opts ] - else [] - , [ "install", "Cabal", "--constraint" - , "Cabal == " ++ showVersion ver ] - ] - - vLog opts $ intercalate " " $ map (("\""++) . (++"\"")) $ cabalProgram opts:cabal_opts - - callProcessStderr (Just "/") (cabalProgram opts) cabal_opts - hPutStrLn stderr "done" - return db - -ghcVersion :: Options -> IO Version -ghcVersion Options {..} = do - parseVer . trim <$> readProcess ghcProgram ["--numeric-version"] "" - -ghcPkgVersion :: Options -> IO Version -ghcPkgVersion Options {..} = do - parseVer . trim . dropWhile (not . isDigit) <$> readProcess ghcPkgProgram ["--version"] "" - -cabalInstallVersion :: Options -> IO Version -cabalInstallVersion Options {..} = do - parseVer . trim <$> readProcess cabalProgram ["--numeric-version"] "" - -trim :: String -> String -trim = dropWhileEnd isSpace - -createPkgDb :: Options -> Version -> IO FilePath -createPkgDb opts@Options {..} ver = do - db <- cabalPkgDb opts ver - exists <- doesDirectoryExist db - when (not exists) $ callProcessStderr Nothing ghcPkgProgram ["init", db] - return db - -cabalPkgDb :: Options -> Version -> IO FilePath -cabalPkgDb opts ver = do - appdir <- appDataDir - ghcVer <- ghcVersion opts - return $ appdir </> "Cabal-" ++ showVersion ver ++ "-db-" ++ showVersion ghcVer - -cabalPkgDbExists :: Options -> Version -> IO Bool -cabalPkgDbExists opts ver = do - db <- cabalPkgDb opts ver - dexists <- doesDirectoryExist db - case dexists of - False -> return False - True -> do - vers <- listCabalVersions' opts (Just db) - return $ ver `elem` vers - -listCabalVersions :: Options -> IO [Version] -listCabalVersions opts = listCabalVersions' opts Nothing - --- TODO: Include sandbox? Probably only relevant for build-type:custom projects. -listCabalVersions' :: Options -> Maybe FilePath -> IO [Version] -listCabalVersions' Options {..} mdb = do - let mdbopt = ("--package-conf="++) <$> mdb - opts = ["list", "--simple-output", "Cabal"] ++ maybeToList mdbopt - - catMaybes . map (fmap snd . parsePkgId . fromString) . words - <$> readProcess ghcPkgProgram opts "" - --- | Find @version: XXX@ delcaration in a cabal file -cabalFileVersion :: String -> Version -cabalFileVersion cabalFile = - fromJust $ parseVer . extract <$> find ("version:" `isPrefixOf`) ls - where - ls = map (map toLower) $ lines cabalFile - extract = dropWhile (/=':') >>> drop 1 >>> dropWhile isSpace >>> takeWhile (not . isSpace) - -vLog :: MonadIO m => Options -> String -> m () -vLog Options { verbose = True } msg = - liftIO $ hPutStrLn stderr msg -vLog _ _ = return () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.5.2.0/Distribution/Helper.hs new/cabal-helper-0.6.0.0/Distribution/Helper.hs --- old/cabal-helper-0.5.2.0/Distribution/Helper.hs 2015-08-20 04:02:22.000000000 +0200 +++ new/cabal-helper-0.6.0.0/Distribution/Helper.hs 2015-09-07 08:02:26.000000000 +0200 @@ -14,17 +14,24 @@ -- You should have received a copy of the GNU Affero General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. -{-# LANGUAGE CPP, FlexibleContexts, ConstraintKinds #-} +{-# LANGUAGE CPP, RecordWildCards, FlexibleContexts, ConstraintKinds #-} {-# LANGUAGE GeneralizedNewtypeDeriving, DeriveDataTypeable, DeriveGeneric #-} module Distribution.Helper ( Programs(..) + , defaultPrograms + , QueryEnv + , qeReadProcess + , qePrograms + , qeProjectDir + , qeDistDir + , qeCabalPkgDb + , qeCabalVer + , defaultQueryEnv -- * Running Queries , Query , runQuery - , runQuery' - , runQuery'' -- * Queries against Cabal\'s on disk state @@ -36,6 +43,7 @@ , ghcPkgOptions , ghcMergedPkgOptions , ghcLangOptions + , pkgLicenses -- * Result types , ChModuleName(..) @@ -67,7 +75,6 @@ import Control.Exception as E import Data.Char import Data.List -import Data.Default import Data.Version import Data.Typeable import Distribution.Simple.BuildPaths (exeExtension) @@ -81,7 +88,7 @@ import Prelude import Paths_cabal_helper (getLibexecDir) -import CabalHelper.Types +import CabalHelper.Types hiding (Options(..)) import CabalHelper.Sandbox -- | Paths or names of various programs we need. @@ -91,8 +98,45 @@ ghcPkgProgram :: FilePath } deriving (Eq, Ord, Show, Read, Generic, Typeable) -instance Default Programs where - def = Programs "cabal" "ghc" "ghc-pkg" +defaultPrograms :: Programs +defaultPrograms = Programs "cabal" "ghc" "ghc-pkg" + +data QueryEnv = QueryEnv { + -- | How to start the cabal-helper process. Useful if you need to + -- capture stderr output from the helper. + qeReadProcess :: FilePath -> [String] -> String -> IO String, + + qePrograms :: Programs, + + -- | Path to project directory, i.e. the one containing the + -- @project.cabal@ file + qeProjectDir :: FilePath, + + -- | Path to the @dist/@ directory + qeDistDir :: FilePath, + + -- | Where to look for the Cabal library when linking the helper + qeCabalPkgDb :: Maybe FilePath, + + -- | If @dist/setup-config@ wasn\'t written by this version of Cabal throw + -- an error + qeCabalVer :: Maybe Version + } + +defaultQueryEnv :: FilePath + -- ^ Path to project directory, i.e. the one containing the + -- @project.cabal@ file + -> FilePath + -- ^ Path to the @dist/@ directory + -> QueryEnv +defaultQueryEnv projdir distdir = QueryEnv { + qeReadProcess = readProcess + , qePrograms = defaultPrograms + , qeProjectDir = projdir + , qeDistDir = distdir + , qeCabalPkgDb = Nothing + , qeCabalVer = Nothing + } data SomeLocalBuildInfo = SomeLocalBuildInfo { slbiPackageDbStack :: [ChPkgDb], @@ -102,7 +146,8 @@ slbiGhcSrcOptions :: [(ChComponentName, [String])], slbiGhcPkgOptions :: [(ChComponentName, [String])], slbiGhcMergedPkgOptions :: [String], - slbiGhcLangOptions :: [(ChComponentName, [String])] + slbiGhcLangOptions :: [(ChComponentName, [String])], + slbiPkgLicenses :: [(String, [(String, Version)])] } deriving (Eq, Ord, Read, Show) -- | Caches helper executable result so it doesn't have to be run more than once @@ -112,54 +157,20 @@ (ReaderT QueryEnv m) a } deriving (Functor, Applicative, Monad, MonadIO) -data QueryEnv = QueryEnv { - _qeReadProcess :: FilePath -> [String] -> String -> IO String, - _qeProgs :: Programs, - _qeProjectDir :: FilePath, - _qeDistDir :: FilePath - } - type MonadQuery m = ( MonadIO m , MonadState (Maybe SomeLocalBuildInfo) m , MonadReader QueryEnv m) -run :: Monad m - => QueryEnv -> Maybe SomeLocalBuildInfo -> Query m a -> m a +run :: Monad m => QueryEnv -> Maybe SomeLocalBuildInfo -> Query m a -> m a run e s action = flip runReaderT e (flip evalStateT s (unQuery action)) -- | @runQuery query distdir@. Run a 'Query'. @distdir@ is where Cabal's -- @setup-config@ file is located. runQuery :: Monad m - => FilePath -- ^ Path to project directory, i.e. the one containing the - -- @project.cabal@ file - -> FilePath -- ^ Path to @dist/@ - -> Query m a - -> m a -runQuery pd dd action = run (QueryEnv readProcess def pd dd) Nothing action - -runQuery' :: Monad m - => Programs - -> FilePath -- ^ Path to project directory, i.e. the one containing the - -- @project.cabal@ file - -> FilePath -- ^ Path to @dist/@ - -> Query m a - -> m a -runQuery' progs pd dd action = - run (QueryEnv readProcess progs pd dd) Nothing action - -runQuery'' :: Monad m - => (FilePath -> [String] -> String -> IO String) - -- ^ How to start the cabal-helper process. Useful if you need to - -- capture stderr output from the helper. - -> Programs - -> FilePath -- ^ Path to project directory, i.e. the one containing the - -- @project.cabal@ file - -> FilePath -- ^ Path to @dist/@ + => QueryEnv -> Query m a -> m a -runQuery'' readProc progs pd dd action = - run (QueryEnv readProc progs pd dd) Nothing action - +runQuery qe action = run qe Nothing action getSlbi :: MonadQuery m => m SomeLocalBuildInfo getSlbi = do @@ -198,6 +209,9 @@ -- | Only language related options, i.e. @-XSomeExtension@ ghcLangOptions :: MonadIO m => Query m [(ChComponentName, [String])] +-- | Get the licenses of the packages the current project is linking against. +pkgLicenses :: MonadIO m => Query m [(String, [(String, Version)])] + packageDbStack = Query $ slbiPackageDbStack `liftM` getSlbi entrypoints = Query $ slbiEntrypoints `liftM` getSlbi sourceDirs = Query $ slbiSourceDirs `liftM` getSlbi @@ -206,6 +220,7 @@ ghcPkgOptions = Query $ slbiGhcPkgOptions `liftM` getSlbi ghcMergedPkgOptions = Query $ slbiGhcMergedPkgOptions `liftM` getSlbi ghcLangOptions = Query $ slbiGhcLangOptions `liftM` getSlbi +pkgLicenses = Query $ slbiPkgLicenses `liftM` getSlbi -- | Run @cabal configure@ reconfigure :: MonadIO m @@ -218,7 +233,7 @@ [ "--with-ghc=" ++ ghcProgram progs ] -- Only pass ghc-pkg if it was actually set otherwise we -- might break cabal's guessing logic - ++ if ghcPkgProgram progs /= ghcPkgProgram def + ++ if ghcPkgProgram progs /= "ghc-pkg" then [ "--with-ghc-pkg=" ++ ghcPkgProgram progs ] else [] ++ cabalOpts @@ -226,13 +241,17 @@ return () getSomeConfigState :: MonadQuery m => m SomeLocalBuildInfo -getSomeConfigState = ask >>= \(QueryEnv readProc progs projdir distdir) -> do - let progArgs = [ "--with-ghc=" ++ ghcProgram progs +getSomeConfigState = ask >>= \QueryEnv {..} -> do + let progs = qePrograms + projdir = qeProjectDir + distdir = qeDistDir + + progArgs = [ "--with-ghc=" ++ ghcProgram progs , "--with-ghc-pkg=" ++ ghcPkgProgram progs , "--with-cabal=" ++ cabalProgram progs ] - let args = [ "package-db-stack" + args = [ "package-db-stack" , "entrypoints" , "source-dirs" , "ghc-options" @@ -240,14 +259,15 @@ , "ghc-pkg-options" , "ghc-merged-pkg-options" , "ghc-lang-options" - ] ++ progArgs + , "licenses" + ] res <- liftIO $ do exe <- findLibexecExe "cabal-helper-wrapper" - out <- readProc exe (projdir:distdir:args) "" + out <- qeReadProcess exe (progArgs ++ projdir:distdir:args) "" evaluate (read out) `E.catch` \(SomeException _) -> error $ concat ["getSomeConfigState", ": ", exe, " " - , intercalate " " (map show $ distdir:args) + , intercalate " " (map show $ progArgs ++ projdir:distdir:args) , " (read failed)"] let [ Just (ChResponsePkgDbs pkgDbs), @@ -257,10 +277,12 @@ Just (ChResponseCompList ghcSrcOpts), Just (ChResponseCompList ghcPkgOpts), Just (ChResponseList ghcMergedPkgOpts), - Just (ChResponseCompList ghcLangOpts) ] = res + Just (ChResponseCompList ghcLangOpts), + Just (ChResponseLicenses pkgLics) + ] = res return $ SomeLocalBuildInfo - pkgDbs eps srcDirs ghcOpts ghcSrcOpts ghcPkgOpts ghcMergedPkgOpts ghcLangOpts + pkgDbs eps srcDirs ghcOpts ghcSrcOpts ghcPkgOpts ghcMergedPkgOpts ghcLangOpts pkgLics -- | Make sure the appropriate helper executable for the given project is -- installed and ready to run queries. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.5.2.0/cabal-helper.cabal new/cabal-helper-0.6.0.0/cabal-helper.cabal --- old/cabal-helper-0.5.2.0/cabal-helper.cabal 2015-08-20 04:02:22.000000000 +0200 +++ new/cabal-helper-0.6.0.0/cabal-helper.cabal 2015-09-07 08:02:26.000000000 +0200 @@ -1,5 +1,5 @@ name: cabal-helper -version: 0.5.2.0 +version: 0.6.0.0 synopsis: Simple interface to some of Cabal's configuration state used by ghc-mod description: @cabal-helper@ provides a library which wraps the internal use of @@ -35,6 +35,7 @@ build-type: Custom cabal-version: >=1.10 extra-source-files: CabalHelper/Main.hs + CabalHelper/Licenses.hs source-repository head type: git @@ -49,7 +50,6 @@ GHC-Options: -Wall Build-Depends: base >= 4.5 && < 5 , Cabal >= 1.14 && < 1.23 - , data-default , directory , filepath , transformers @@ -66,6 +66,8 @@ CabalHelper.Common CabalHelper.GuessGhc CabalHelper.Data + CabalHelper.Compile + CabalHelper.Log GHC-Options: -Wall X-Install-Target: $libexecdir Build-Depends: base >= 4.5 && < 5 @@ -78,16 +80,26 @@ , template-haskell , temporary , utf8-string - + , ghc-prim Test-Suite spec Default-Language: Haskell2010 Type: exitcode-stdio-1.0 Main-Is: Spec.hs - Hs-Source-Dirs: tests + Hs-Source-Dirs: tests, . GHC-Options: -Wall Build-Depends: base >= 4.5 && < 5 , cabal-helper , extra , unix + , Cabal >= 1.14 && < 1.23 + , directory + , filepath + , transformers + , mtl , process + , ghc-prim + , bytestring + , utf8-string + , template-haskell + , temporary \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cabal-helper-0.5.2.0/tests/Spec.hs new/cabal-helper-0.6.0.0/tests/Spec.hs --- old/cabal-helper-0.5.2.0/tests/Spec.hs 2015-08-20 04:02:22.000000000 +0200 +++ new/cabal-helper-0.6.0.0/tests/Spec.hs 2015-09-07 08:02:26.000000000 +0200 @@ -2,10 +2,83 @@ import System.Environment.Extra (lookupEnv) import System.Posix.Env (setEnv) import System.Process +import System.Exit import Data.Maybe +import Data.Version import Data.Functor +import Control.Exception as E +import Control.Arrow + +import CabalHelper.Common +import CabalHelper.Compile +import CabalHelper.Types main :: IO () main = do flip (setEnv "HOME") True =<< fromMaybe "/tmp" <$> lookupEnv "TMPDIR" writeAutogenFiles readProcess "." "./dist" + + _ <- system "cabal update" + + let vers :: [(Version, [Version])] + vers = map (parseVer *** map parseVer) [ + ("7.4", [ "1.14.0" + ]), + + ("7.6", [ "1.16.0" + , "1.16.0.1" + , "1.16.0.2" + , "1.16.0.3" + ]), + + ("7.8", [ +-- "1.18.0" +-- , "1.18.1" + "1.18.1.1" +-- , "1.18.1.2" + , "1.18.1.3" + , "1.18.1.4" + , "1.18.1.5" + , "1.18.1.6" + + , "1.20.0.0" + , "1.20.0.1" + , "1.20.0.2" + , "1.20.0.3" + , "1.22.0.0" + , "1.22.1.0" + , "1.22.1.1" + ]), + + ("7.10", [ + "1.22.2.0" + , "1.22.3.0" + , "1.22.4.0" + ]) + ] + + ghcVer <- ghcVersion defaultOptions + + let cabalVers = concat $ map snd $ dropWhile ((<ghcVer) . fst) vers + + rvs <- mapM compilePrivatePkgDb cabalVers + + if any isLeft' rvs + then exitFailure + else exitSuccess + where + isLeft' (Left _) = True + isLeft' (Right _) = False + +compilePrivatePkgDb :: Version -> IO (Either ExitCode FilePath) +compilePrivatePkgDb cabalVer = do + db <- installCabal defaultOptions cabalVer `E.catch` + \(SomeException _) -> errorInstallCabal cabalVer "dist" + compileWithPkg "." (Just db) cabalVer + +compileWithPkg :: FilePath -> Maybe FilePath -> Version -> IO (Either ExitCode FilePath) +compileWithPkg chdir mdb ver = + compile "dist" defaultOptions $ Compile chdir Nothing mdb ver [cabalPkgId ver] + +cabalPkgId :: Version -> String +cabalPkgId v = "Cabal-" ++ showVersion v

6 years, 9 months

commit python-keyczar for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package python-keyczar for openSUSE:Factory checked in at 2015-09-30 05:53:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-keyczar (Old) and /work/SRC/openSUSE:Factory/.python-keyczar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-keyczar" Changes: -------- --- /work/SRC/openSUSE:Factory/python-keyczar/python-keyczar.changes 2013-04-18 15:00:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-keyczar.new/python-keyczar.changes 2015-09-30 05:53:10.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Sep 28 08:33:26 UTC 2015 - michael(a)stroeder.com + +- added build dependency on python-setuptools +- symbolic link /usr/bin/keyczart not needed anymore +- update to version 0.715 + * Change version numbering to match PEP-0440 + * Unpadding happens after MAC validation to prevent padding oracle attacks + * Added Encoding options to all crypto operations to select whether or not + not encoding should be used. + * Python version setup improved for PyPi. + * AttachedSign with empty nonce now correctly functions. + +------------------------------------------------------------------- Old: ---- python-keyczar-0.71c.tar.bz2 New: ---- python-keyczar-0.715.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-keyczar.spec ++++++ --- /var/tmp/diff_new_pack.IB1tFf/_old 2015-09-30 05:53:11.000000000 +0200 +++ /var/tmp/diff_new_pack.IB1tFf/_new 2015-09-30 05:53:11.000000000 +0200 @@ -18,17 +18,18 @@ %define pkgname keyczar Name: python-keyczar -Version: 0.71c +Version: 0.715 Release: 1 License: Apache-2.0 Summary: Toolkit for safe and simple cryptography Url: http://www.keyczar.org Group: Development/Languages/Python -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.gz Source1: keyczart.1 BuildRequires: python-asn1 >= 0.0.8a BuildRequires: python-devel BuildRequires: python-pycrypto +BuildRequires: python-setuptools Requires: python-asn1 >= 0.0.8a Requires: python-pycrypto BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -75,7 +76,6 @@ mv %{buildroot}%{python_sitelib}/keyczar/keyczart.py.new %{buildroot}%{python_sitelib}/keyczar/keyczart.py chmod +x %{buildroot}%{python_sitelib}/keyczar/keyczart.py mkdir -p %{buildroot}%{_bindir} -ln -s ../../%{python_sitelib}/keyczar/keyczart.py %{buildroot}%{_bindir}/keyczart # include man page install -Dm644 %{SOURCE1} %{buildroot}%{_mandir}/man1/keyczart.1

6 years, 9 months

commit perl-Mojolicious-Plugin-AssetPack for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package perl-Mojolicious-Plugin-AssetPack for openSUSE:Factory checked in at 2015-09-30 05:53:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Mojolicious-Plugin-AssetPack (Old) and /work/SRC/openSUSE:Factory/.perl-Mojolicious-Plugin-AssetPack.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Mojolicious-Plugin-AssetPack" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Mojolicious-Plugin-AssetPack/perl-Mojolicious-Plugin-AssetPack.changes 2015-09-03 18:07:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Mojolicious-Plugin-AssetPack.new/perl-Mojolicious-Plugin-AssetPack.changes 2015-09-30 05:53:09.000000000 +0200 @@ -1,0 +2,47 @@ +Mon Sep 28 08:55:09 UTC 2015 - coolo(a)suse.com + +- updated to 0.68 + see /usr/share/doc/packages/perl-Mojolicious-Plugin-AssetPack/Changes + + 0.68 2015-09-28T08:28:29+0200 + - Will skip tests unless possible to write to out_dir + + 0.67 2015-09-27T15:24:23+0200 + - Fix asset can be read-only + + 0.66 2015-09-27T14:56:56+0200 + - Skip some tests on windows + - Remove EXPERIMENTAL remark for wildcards in filenames #52 + - Remove EXPERIMENTAL remark from headers() + - Remove EXPERIMENTAL remark from source_paths() + +------------------------------------------------------------------- +Sat Sep 26 08:55:45 UTC 2015 - coolo(a)suse.com + +- updated to 0.65 + see /usr/share/doc/packages/perl-Mojolicious-Plugin-AssetPack/Changes + + 0.65 2015-09-25T16:55:49+0200 + - Add EXPERIMENTAL fixed mapping between moniker to packed files #64 + - Add EXPERIMENTAL test_app() to ensure all assets are created + - Change headers() into a method + - Change out_dir() into a read-only method, as documented + - Remove EXPERIMENTAL support for reloader.js + - Remove deprecated preprocessor() method + - Remove support for in-memory assets #64 + - Fix memory leak + +------------------------------------------------------------------- +Sun Sep 20 16:06:07 UTC 2015 - coolo(a)suse.com + +- updated to 0.64 + see /usr/share/doc/packages/perl-Mojolicious-Plugin-AssetPack/Changes + + 0.64 2015-09-20T11:44:26+0200 + - Add "SHIPPING" section to Cookbook + - Fix adding custom response headers when assets are already built #55 + - Fix always add newline to JavaScript assets to prevent issues with comments + - Improved logging for in-memory assets + - Improved error reporting when unable to build assets + +------------------------------------------------------------------- Old: ---- Mojolicious-Plugin-AssetPack-0.63.tar.gz New: ---- Mojolicious-Plugin-AssetPack-0.68.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Mojolicious-Plugin-AssetPack.spec ++++++ --- /var/tmp/diff_new_pack.CnwgqO/_old 2015-09-30 05:53:10.000000000 +0200 +++ /var/tmp/diff_new_pack.CnwgqO/_new 2015-09-30 05:53:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Mojolicious-Plugin-AssetPack -Version: 0.63 +Version: 0.68 Release: 0 %define cpan_name Mojolicious-Plugin-AssetPack Summary: Compress and convert css, less, sass, javascript and coffeescript files ++++++ Mojolicious-Plugin-AssetPack-0.63.tar.gz -> Mojolicious-Plugin-AssetPack-0.68.tar.gz ++++++ ++++ 2403 lines of diff (skipped)

6 years, 9 months

commit wammu for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package wammu for openSUSE:Factory checked in at 2015-09-30 05:53:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wammu (Old) and /work/SRC/openSUSE:Factory/.wammu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wammu" Changes: -------- --- /work/SRC/openSUSE:Factory/wammu/wammu.changes 2015-01-14 11:45:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wammu.new/wammu.changes 2015-09-30 05:53:07.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Sep 27 11:52:23 UTC 2015 - ecsos(a)opensuse.org + +- Update to 0.39 + * Fixed connecting to phone with no SMSC set. + * Various code cleanups. + +------------------------------------------------------------------- Old: ---- wammu-0.38.tar.bz2 New: ---- wammu-0.39.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wammu.spec ++++++ --- /var/tmp/diff_new_pack.53AdXG/_old 2015-09-30 05:53:08.000000000 +0200 +++ /var/tmp/diff_new_pack.53AdXG/_new 2015-09-30 05:53:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wammu # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,7 +17,7 @@ Name: wammu -Version: 0.38 +Version: 0.39 Release: 0 Summary: Mobile Phone Manager License: GPL-2.0 ++++++ wammu-0.38.tar.bz2 -> wammu-0.39.tar.bz2 ++++++ ++++ 11976 lines of diff (skipped)

6 years, 9 months

commit leptonica for openSUSE:Factory

by root＠hilbert.suse.de

Hello community, here is the log from the commit of package leptonica for openSUSE:Factory checked in at 2015-09-30 05:52:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/leptonica (Old) and /work/SRC/openSUSE:Factory/.leptonica.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "leptonica" Changes: -------- --- /work/SRC/openSUSE:Factory/leptonica/leptonica.changes 2014-10-02 14:14:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.leptonica.new/leptonica.changes 2015-09-30 05:53:06.000000000 +0200 @@ -1,0 +2,34 @@ +Sun Sep 27 20:56:59 UTC 2015 - asterios.dramis(a)gmail.com + +- Update to 1.72: + * Better handling of 1 bpp colormap read/write with png so that + they are losseless. The colormap is always removed on read and + the conversion is to the simplest non-cmapped pix that can + fully represent the input -- both with and without alpha. + * Fixed overflow bug in pixCorrelationBinary(). + * Fixed orientation flags and handling of 16 bit RGB in tiff. + * Also new wrappers to TIFFClientOpen(), so we no longer go + through the file descriptor for memory operations. + * Improvements in the dewarp functions. + * New box sequence smoothings. + * New antialiased painting through mask; previously it was only + implemented for connected components in a mask. + * Better error handling and debug output with jpeg2000 + read/write. + * Implemented base64 encoding. This allows binary data to be + represented as a C string that can be compiled. Used this in + bmf utility. + * Implemented automatic code generation for deserialization from + compiled strings (stringcode.*) + * Regression tests write to leptonica subdir of in windows; in + unix it is optional. This avoids spamming the directory. + * Added new colorspace conversions (XYZ, LAB). + * New source files: encoding.c, bmfdata.h, stringcode.c, + stringcode.h, bootnumgen.c. + * Removed source files: convolvelow.c, graymorphlow.c + * New programs: genfonts_reg, colorize_reg, texturefill_reg, + autogentest1, autogentest2. + * alltests_reg now has 66 tests. +- Added new build requirement openjpeg2-devel for openSUSE > 13.1. + +------------------------------------------------------------------- Old: ---- leptonica-1.71.tar.gz New: ---- leptonica-1.72.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ leptonica.spec ++++++ --- /var/tmp/diff_new_pack.4O2Lbd/_old 2015-09-30 05:53:07.000000000 +0200 +++ /var/tmp/diff_new_pack.4O2Lbd/_new 2015-09-30 05:53:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package leptonica # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -19,9 +19,9 @@ %define major 4 Name: leptonica -Version: 1.71 +Version: 1.72 Release: 0 -Summary: Leptonica Library +Summary: Library for image processing and image analysis applications License: BSD-2-Clause Group: System/Libraries Url: http://leptonica.org/ @@ -30,6 +30,9 @@ BuildRequires: giflib-devel BuildRequires: libjpeg-devel BuildRequires: libtool +%if 0%{?suse_version} > 1310 +BuildRequires: openjpeg2-devel +%endif BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libwebp) >= 0.2.0 @@ -39,7 +42,7 @@ Library for efficient image processing and image analysis operations. %package -n liblept%{major} -Summary: Leptonica Library +Summary: Library for image processing and image analysis applications Group: System/Libraries %description -n liblept%{major} ++++++ leptonica-1.71.tar.gz -> leptonica-1.72.tar.gz ++++++ /work/SRC/openSUSE:Factory/leptonica/leptonica-1.71.tar.gz /work/SRC/openSUSE:Factory/.leptonica.new/leptonica-1.72.tar.gz differ: char 5, line 1

6 years, 9 months

Jump to page:

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

openSUSE Commits September 2015