Hello community, here is the log from the commit of package ghc-unix-time for openSUSE:Leap:15.2 checked in at 2020-02-19 18:42:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ghc-unix-time (Old) and /work/SRC/openSUSE:Leap:15.2/.ghc-unix-time.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-unix-time" Wed Feb 19 18:42:00 2020 rev:14 rq:771512 version:0.4.7 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ghc-unix-time/ghc-unix-time.changes 2020-01-15 15:02:43.577819527 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ghc-unix-time.new.26092/ghc-unix-time.changes 2020-02-19 18:42:01.662264301 +0100 @@ -1,0 +2,17 @@ +Fri Nov 8 16:15:07 UTC 2019 - Peter Simons <[email protected]> + +- Drop obsolete group attributes. + +------------------------------------------------------------------- +Wed Jun 19 11:46:01 UTC 2019 - [email protected] + +- Update unix-time to version 0.4.7. + Upstream does not provide a change log file. + +------------------------------------------------------------------- +Fri Jun 14 02:03:26 UTC 2019 - [email protected] + +- Update unix-time to version 0.4.6. + Upstream does not provide a change log file. + +------------------------------------------------------------------- Old: ---- unix-time-0.4.5.tar.gz New: ---- unix-time-0.4.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-unix-time.spec ++++++ --- /var/tmp/diff_new_pack.SDj1bf/_old 2020-02-19 18:42:02.434265919 +0100 +++ /var/tmp/diff_new_pack.SDj1bf/_new 2020-02-19 18:42:02.434265919 +0100 @@ -19,11 +19,10 @@ %global pkg_name unix-time %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.4.5 +Version: 0.4.7 Release: 0 Summary: Unix time parser/formatter and utilities License: BSD-3-Clause -Group: Development/Libraries/Haskell URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel @@ -43,7 +42,6 @@ %package devel Summary: Haskell %{pkg_name} library development files -Group: Development/Libraries/Haskell Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} ++++++ unix-time-0.4.5.tar.gz -> unix-time-0.4.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-time-0.4.5/Data/UnixTime/Conv.hs new/unix-time-0.4.7/Data/UnixTime/Conv.hs --- old/unix-time-0.4.5/Data/UnixTime/Conv.hs 2019-01-22 04:43:00.000000000 +0100 +++ new/unix-time-0.4.7/Data/UnixTime/Conv.hs 2019-06-18 09:45:05.000000000 +0200 @@ -71,6 +71,7 @@ -- This is a wrapper for strftime_l(). -- 'utMicroSeconds' is ignored. -- The result depends on the TZ environment variable. +-- formatUnixTime :: Format -> UnixTime -> IO ByteString formatUnixTime fmt t = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-time-0.4.5/Data/UnixTime/Sys.hsc new/unix-time-0.4.7/Data/UnixTime/Sys.hsc --- old/unix-time-0.4.5/Data/UnixTime/Sys.hsc 2019-01-22 04:43:00.000000000 +0100 +++ new/unix-time-0.4.7/Data/UnixTime/Sys.hsc 2019-06-18 09:45:05.000000000 +0200 @@ -26,6 +26,4 @@ getUnixTime :: IO UnixTime getUnixTime = allocaBytes (#const sizeof(struct timeval)) $ \ p_timeval -> do throwErrnoIfMinus1_ "getClockTime" $ c_gettimeofday p_timeval nullPtr - sec <- (#peek struct timeval,tv_sec) p_timeval - usec <- (#peek struct timeval,tv_usec) p_timeval - return $ UnixTime sec usec + peek (castPtr p_timeval) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-time-0.4.5/cbits/config.h.in new/unix-time-0.4.7/cbits/config.h.in --- old/unix-time-0.4.5/cbits/config.h.in 2019-01-22 04:43:00.000000000 +0100 +++ new/unix-time-0.4.7/cbits/config.h.in 2019-06-18 09:45:05.000000000 +0200 @@ -21,6 +21,12 @@ /* Define to 1 if you have the `strptime_l' function. */ #undef HAVE_STRPTIME_L +/* Define to 1 if you have the `strtoll_l' function. */ +#undef HAVE_STRTOLL_L + +/* Define to 1 if you have the `strtol_l' function. */ +#undef HAVE_STRTOL_L + /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H @@ -30,27 +36,39 @@ /* Define to 1 if you have the `timegm' function. */ #undef HAVE_TIMEGM -/* Define to 1 if you have the `_mkgmtime' function. */ -#undef HAVE__MKGMTIME +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the <xlocale.h> header file. */ +#undef HAVE_XLOCALE_H + +/* Define to 1 if you have the `_create_locale' function. */ +#undef HAVE__CREATE_LOCALE /* Define to 1 if you have the `_get_current_locale' function. */ #undef HAVE__GET_CURRENT_LOCALE -/* Define to 1 if you have the `strtol_l' function. */ -#undef HAVE_STRTOL_L +/* Define to 1 if you have the `_isblank_l' function. */ +#undef HAVE__ISBLANK_L -/* Define to 1 if you have the `strtoll_l' function. */ -#undef HAVE_STRTOLL_L +/* Define to 1 if you have the `_isdigit_l' function. */ +#undef HAVE__ISDIGIT_L -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H +/* Define to 1 if you have the `_isspace_l' function. */ +#undef HAVE__ISSPACE_L -/* Define to 1 if you have the <xlocale.h> header file. */ -#undef HAVE_XLOCALE_H +/* Define to 1 if you have the `_isupper_l' function. */ +#undef HAVE__ISUPPER_L + +/* Define to 1 if you have the `_mkgmtime' function. */ +#undef HAVE__MKGMTIME /* "Is Linux" */ #undef IS_LINUX +/* "Is Windows NT 6.1" */ +#undef IS_NT61 + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-time-0.4.5/cbits/conv.c new/unix-time-0.4.7/cbits/conv.c --- old/unix-time-0.4.5/cbits/conv.c 2019-01-22 04:43:00.000000000 +0100 +++ new/unix-time-0.4.7/cbits/conv.c 2019-06-18 09:45:05.000000000 +0200 @@ -50,7 +50,7 @@ char *tz; tz = getenv("TZ"); #if defined(_WIN32) - _patch_setenv("TZ", "", 1); + _patch_setenv("TZ", "UTC", 1); #else setenv("TZ", "", 1); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-time-0.4.5/cbits/strftime.c new/unix-time-0.4.7/cbits/strftime.c --- old/unix-time-0.4.5/cbits/strftime.c 2019-01-22 04:43:00.000000000 +0100 +++ new/unix-time-0.4.7/cbits/strftime.c 2019-06-18 09:45:05.000000000 +0200 @@ -112,8 +112,11 @@ { #if HAVE__GET_CURRENT_LOCALE return _patch_strftime_l(s, maxsize, format, t, _get_current_locale()); -#else +#elif HAVE__CREATE_LOCALE && !IS_NT61 return _patch_strftime_l(s, maxsize, format, t, _create_locale(LC_TIME, "C")); +#else + _locale_t locale; + return _patch_strftime_l(s, maxsize, format, t, locale); #endif } @@ -519,7 +522,8 @@ #ifdef ALTZONE diff = -altzone; #else /* !defined ALTZONE */ - continue; + // Fix the daylight saving time, see #54. + diff = -(_timezone - 3600 * t->tm_isdst); #endif /* !defined ALTZONE */ #endif /* !defined TM_GMTOFF */ if (diff < 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-time-0.4.5/cbits/strptime.c new/unix-time-0.4.7/cbits/strptime.c --- old/unix-time-0.4.5/cbits/strptime.c 2019-01-22 04:43:00.000000000 +0100 +++ new/unix-time-0.4.7/cbits/strptime.c 2019-06-18 09:45:05.000000000 +0200 @@ -712,7 +712,10 @@ { #if HAVE__GET_CURRENT_LOCALE return strptime_l(buf, fmt, tm, _get_current_locale()); -#else +#elif HAVE__CREATE_LOCALE && !IS_NT61 return strptime_l(buf, fmt, tm, _create_locale(LC_TIME, "C")); +#else + _locale_t locale; + return strptime_l(buf, fmt, tm, locale); #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-time-0.4.5/cbits/win_patch.c new/unix-time-0.4.7/cbits/win_patch.c --- old/unix-time-0.4.5/cbits/win_patch.c 2019-01-22 04:43:00.000000000 +0100 +++ new/unix-time-0.4.7/cbits/win_patch.c 2019-06-18 09:45:05.000000000 +0200 @@ -12,10 +12,12 @@ } #endif +#if !HAVE__ISBLANK_L inline int isblank_l( int c, _locale_t _loc) { return ( c == ' ' || c == '\t' ); } +#endif inline int strncasecmp_l(const char *s1, const char *s2, int len, _locale_t _loc) { return strncasecmp(s1, s2, len); @@ -98,18 +100,26 @@ }; -int _patch_setenv(const char *var, const char *val, int ovr) { - BOOL b = SetEnvironmentVariableA(var, val); - if (b) { - return 0; - } else { - return 1; +int _patch_setenv(const char *var, const char *val, int _ovr) { + if (val == NULL) { + return _patch_unsetenv(var); } + int varlen = strlen(var); + int vallen = strlen(val); + int len = varlen + vallen + 2; + char *sname = (char *)malloc(len); + strcpy(sname, var); + sname[varlen] = '='; + strcpy(sname + varlen + 1, val); + sname[varlen + vallen + 1] = '\0'; + int r = _putenv(sname); + free(sname); + return r; } int _patch_unsetenv(const char *name) { - int len = strlen(name); - char *sname = (char *)malloc(len + 2); + int len = strlen(name) + 2; + char *sname = (char *)malloc(len); strcpy(sname, name); sname[len] = '='; sname[len + 1] = '\0'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-time-0.4.5/cbits/win_patch.h new/unix-time-0.4.7/cbits/win_patch.h --- old/unix-time-0.4.5/cbits/win_patch.h 2019-01-22 04:43:00.000000000 +0100 +++ new/unix-time-0.4.7/cbits/win_patch.h 2019-06-18 09:45:05.000000000 +0200 @@ -81,9 +81,23 @@ 1 + TYPE_SIGNED(type)) #endif /* !defined INT_STRLEN_MAXIMUM */ +#if HAVE__ISSPACE_L #define isspace_l _isspace_l +#else +#define isspace_l(ch, locale) isspace(ch) +#endif + +#if HAVE__ISUPPER_L #define isupper_l _isupper_l +#else +#define isupper_l(ch, locale) isupper(ch) +#endif + +#if HAVE__ISDIGIT_L #define isdigit_l _isdigit_l +#else +#define isdigit_l(ch, locale) isdigit(ch) +#endif #if !HAVE_STRTOL_L long strtol_l(const char *nptr, char **endptr, int base, _locale_t locale); @@ -102,7 +116,9 @@ #define isleap_sum(a, b) isleap((a) % 400 + (b) % 400) #endif /* !defined isleap_sum */ +#if !HAVE__ISBLANK_L int isblank_l( int c, _locale_t _loc); +#endif int strncasecmp_l(const char *s1, const char *s2, int len, _locale_t _loc); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-time-0.4.5/configure new/unix-time-0.4.7/configure --- old/unix-time-0.4.5/configure 2019-01-22 04:43:00.000000000 +0100 +++ new/unix-time-0.4.7/configure 2019-06-18 09:45:05.000000000 +0200 @@ -3326,6 +3326,17 @@ fi done +for ac_func in _create_locale +do : + ac_fn_c_check_func "$LINENO" "_create_locale" "ac_cv_func__create_locale" +if test "x$ac_cv_func__create_locale" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE__CREATE_LOCALE 1 +_ACEOF + +fi +done + for ac_func in strtol_l do : ac_fn_c_check_func "$LINENO" "strtol_l" "ac_cv_func_strtol_l" @@ -3348,6 +3359,50 @@ fi done +for ac_func in _isspace_l +do : + ac_fn_c_check_func "$LINENO" "_isspace_l" "ac_cv_func__isspace_l" +if test "x$ac_cv_func__isspace_l" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE__ISSPACE_L 1 +_ACEOF + +fi +done + +for ac_func in _isupper_l +do : + ac_fn_c_check_func "$LINENO" "_isupper_l" "ac_cv_func__isupper_l" +if test "x$ac_cv_func__isupper_l" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE__ISUPPER_L 1 +_ACEOF + +fi +done + +for ac_func in _isdigit_l +do : + ac_fn_c_check_func "$LINENO" "_isdigit_l" "ac_cv_func__isdigit_l" +if test "x$ac_cv_func__isdigit_l" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE__ISDIGIT_L 1 +_ACEOF + +fi +done + +for ac_func in _isblank_l +do : + ac_fn_c_check_func "$LINENO" "_isblank_l" "ac_cv_func__isblank_l" +if test "x$ac_cv_func__isblank_l" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE__ISBLANK_L 1 +_ACEOF + +fi +done + host=`uname -a` case $host in @@ -3364,6 +3419,22 @@ #define IS_LINUX $LINUX _ACEOF + +case $host in + MINGW??_NT-6.1*) + NT61=1 + ;; + *) + NT61=0 + ;; +esac + + +cat >>confdefs.h <<_ACEOF +#define IS_NT61 $NT61 +_ACEOF + + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-time-0.4.5/configure.ac new/unix-time-0.4.7/configure.ac --- old/unix-time-0.4.5/configure.ac 2019-01-22 04:43:00.000000000 +0100 +++ new/unix-time-0.4.7/configure.ac 2019-06-18 09:45:05.000000000 +0200 @@ -10,8 +10,13 @@ AC_CHECK_FUNCS(timegm) AC_CHECK_FUNCS(_mkgmtime) AC_CHECK_FUNCS(_get_current_locale) +AC_CHECK_FUNCS(_create_locale) AC_CHECK_FUNCS(strtol_l) AC_CHECK_FUNCS(strtoll_l) +AC_CHECK_FUNCS(_isspace_l) +AC_CHECK_FUNCS(_isupper_l) +AC_CHECK_FUNCS(_isdigit_l) +AC_CHECK_FUNCS(_isblank_l) host=`uname -a` case $host in @@ -24,4 +29,16 @@ esac AC_DEFINE_UNQUOTED(IS_LINUX,$LINUX,"Is Linux") + +case $host in + MINGW??_NT-6.1*) + NT61=1 + ;; + *) + NT61=0 + ;; +esac + +AC_DEFINE_UNQUOTED(IS_NT61,$NT61,"Is Windows NT 6.1") + AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unix-time-0.4.5/unix-time.cabal new/unix-time-0.4.7/unix-time.cabal --- old/unix-time-0.4.5/unix-time.cabal 2019-01-22 04:43:00.000000000 +0100 +++ new/unix-time-0.4.7/unix-time.cabal 2019-06-18 09:45:05.000000000 +0200 @@ -1,5 +1,5 @@ Name: unix-time -Version: 0.4.5 +Version: 0.4.7 Author: Kazu Yamamoto <[email protected]> Maintainer: Kazu Yamamoto <[email protected]> License: BSD3
