diff --git a/debian/changelog b/debian/changelog index afe6a47..f9e1907 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ -libhdate (1.6-4) UNRELEASED; urgency=medium - +libhdate (1.6.02-1) UNRELEASED; urgency=medium + + * New upstream release: + - manpage.patch dropped (merged upstream) + - patch fix_3 dropped (merged upstream) + - nested_extern.patch dropped (merged upstream) + - missing_format.patch dropped (merged upstream) * Remove some Multiarch settings. A temporary workaround for now. (Closes: #807516, #818539) * misc:Pre-Depends' instead of multiarch-support diff --git a/debian/patches/cflags.patch b/debian/patches/cflags.patch index ca18aed..6fdcf8d 100644 --- a/debian/patches/cflags.patch +++ b/debian/patches/cflags.patch @@ -8,26 +8,6 @@ * The perl and python bindings were not using the values of those variables. ---- a/configure.in -+++ b/configure.in -@@ -33,7 +33,6 @@ AC_C_CONST - AC_CONFIG_MACRO_DIR([m4]) - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - --CFLAGS= - LIBS=-lm - - dnl ======================================================================================= ---- a/configure -+++ b/configure -@@ -12466,7 +12466,6 @@ fi - - - --CFLAGS= - LIBS=-lm - - --- a/bindings/perl/Makefile.am +++ b/bindings/perl/Makefile.am @@ -11,8 +11,8 @@ all-am: hdate.so @@ -43,7 +23,208 @@ swig -perl -c++ hdate.i --- a/bindings/perl/Makefile.in +++ b/bindings/perl/Makefile.in -@@ -402,8 +402,8 @@ uninstall-am: +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2014 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,23 +14,61 @@ + + @SET_MAKE@ + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -51,7 +88,6 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = bindings/perl +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +@@ -63,9 +99,22 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/g + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + SOURCES = + DIST_SOURCES = + am__can_run_installinfo = \ +@@ -73,9 +122,12 @@ am__can_run_installinfo = \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++am__DIST_COMMON = $(srcdir)/Makefile.in + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +@@ -123,6 +175,7 @@ LN_S = @LN_S@ + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ + LTLIBOBJS = @LTLIBOBJS@ ++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MANIFEST_TOOL = @MANIFEST_TOOL@ +@@ -222,6 +275,7 @@ pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ ++runstatedir = @runstatedir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ +@@ -248,7 +302,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bindings/perl/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu bindings/perl/Makefile +-.PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +@@ -272,11 +325,11 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +-tags: TAGS +-TAGS: ++tags TAGS: ++ ++ctags CTAGS: + +-ctags: CTAGS +-CTAGS: ++cscope cscopelist: + + + distdir: $(DISTFILES) +@@ -414,23 +467,26 @@ uninstall-am: + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-data-local install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am ++ cscopelist-am ctags-am distclean distclean-generic \ ++ distclean-libtool distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am \ ++ install-data-local install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ ++ uninstall-am ++ ++.PRECIOUS: Makefile + + @WITH_PERL_TRUE@all-am: hdate.so @WITH_PERL_TRUE@hdate.so: hdate_wrap.cxx @@ -69,7 +250,208 @@ swig -python -c++ hdate.i --- a/bindings/python/Makefile.in +++ b/bindings/python/Makefile.in -@@ -402,8 +402,8 @@ uninstall-am: +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11.6 from Makefile.am. ++# Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. ++# Copyright (C) 1994-2014 Free Software Foundation, Inc. ++ + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,23 +14,61 @@ + + @SET_MAKE@ + VPATH = @srcdir@ +-am__make_dryrun = \ +- { \ +- am__dry=no; \ ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ +- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ +- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ +- *) \ +- for am__flg in $$MAKEFLAGS; do \ +- case $$am__flg in \ +- *=*|--*) ;; \ +- *n*) am__dry=yes; break;; \ +- esac; \ +- done;; \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ + esac; \ +- test $$am__dry = yes; \ +- } ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +@@ -51,7 +88,6 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + subdir = bindings/python +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +@@ -63,9 +99,22 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/g + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) + mkinstalldirs = $(install_sh) -d + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = + SOURCES = + DIST_SOURCES = + am__can_run_installinfo = \ +@@ -73,9 +122,12 @@ am__can_run_installinfo = \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++am__DIST_COMMON = $(srcdir)/Makefile.in + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +@@ -123,6 +175,7 @@ LN_S = @LN_S@ + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ + LTLIBOBJS = @LTLIBOBJS@ ++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MANIFEST_TOOL = @MANIFEST_TOOL@ +@@ -222,6 +275,7 @@ pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ ++runstatedir = @runstatedir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ +@@ -248,7 +302,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bindings/python/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu bindings/python/Makefile +-.PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +@@ -272,11 +325,11 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +-tags: TAGS +-TAGS: ++tags TAGS: ++ ++ctags CTAGS: + +-ctags: CTAGS +-CTAGS: ++cscope cscopelist: + + + distdir: $(DISTFILES) +@@ -414,23 +467,26 @@ uninstall-am: + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-data-local install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am ++ cscopelist-am ctags-am distclean distclean-generic \ ++ distclean-libtool distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am \ ++ install-data-local install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ ++ uninstall-am ++ ++.PRECIOUS: Makefile + + @WITH_PYTHON_TRUE@all-am: _hdate.so @WITH_PYTHON_TRUE@_hdate.so: hdate_wrap.cxx @@ -80,3 +462,13 @@ @WITH_PYTHON_TRUE@hdate_wrap.cxx: hdate.i @WITH_PYTHON_TRUE@ swig -python -c++ hdate.i +--- a/configure.in ++++ b/configure.in +@@ -33,7 +33,6 @@ AC_C_CONST + AC_CONFIG_MACRO_DIR([m4]) + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + +-CFLAGS=" -Wall -g -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -O1 -fstack-protector --param ssp-buffer-size=4 -fPIE -pie" + LIBS=-lm + + dnl ======================================================================================= diff --git a/debian/patches/clang.patch b/debian/patches/clang.patch index c25c66e..e85cf9b 100644 --- a/debian/patches/clang.patch +++ b/debian/patches/clang.patch @@ -32,7 +32,7 @@ if (colorize) colorize_element(ELEMENT_WEEKDAY_NAMES); for (column = 1; column < 7; column++) print_dow_column(column); if (colorize) colorize_element(ELEMENT_SHABBAT_NAME); -@@ -1149,27 +1149,15 @@ void print_week( int jd, const int month +@@ -1149,31 +1149,15 @@ void print_week( int jd, const int month @@ -44,9 +44,13 @@ - hdate_struct h; - int calendar_line; - int max_calendar_lines = 4; -- int previous_month, next_month; +- /// the initializations on next line aren't truly necessary, but they do +- /// suppress warning "may be used uninitialized in this function [-Wmaybe-uninitialized]" +- int previous_month = 1, next_month = 1; - int previous_year, next_year; -- int jd_current_month, jd_previous_month, jd_next_month; +- /// the initializations on next line aren't truly necessary, but they do +- /// suppress warning "may be used uninitialized in this function [-Wmaybe-uninitialized]" +- int jd_current_month, jd_previous_month = 1, jd_next_month = 1; - - void how_many_calendar_lines( int month, int start_dow ) +void how_many_calendar_lines( int month, int start_dow, int *max_calendar_lines ) @@ -63,7 +67,7 @@ break; case 1: case 3: -@@ -1177,12 +1165,24 @@ int print_calendar ( const int current_m +@@ -1177,14 +1165,30 @@ int print_calendar ( const int current_m case 7: case 8: case 10: @@ -72,6 +76,9 @@ + case 12: if (start_dow > 5) *max_calendar_lines = 6; + else if (*max_calendar_lines == 4) *max_calendar_lines = 5; break; +- case 2: if (start_dow > 1 && max_calendar_lines == 4) max_calendar_lines = 5; ++ case 2: if (start_dow > 1 && *max_calendar_lines == 4) *max_calendar_lines = 5; + break; } } @@ -83,9 +90,13 @@ + hdate_struct h; + int calendar_line; + int max_calendar_lines = 4; -+ int previous_month, next_month; ++ /// the initializations on next line aren't truly necessary, but they do ++ /// suppress warning "may be used uninitialized in this function [-Wmaybe-uninitialized]" ++ int previous_month = 1, next_month = 1; + int previous_year, next_year; -+ int jd_current_month, jd_previous_month, jd_next_month; ++ /// the initializations on next line aren't truly necessary, but they do ++ /// suppress warning "may be used uninitialized in this function [-Wmaybe-uninitialized]" ++ int jd_current_month, jd_previous_month = 1, jd_next_month = 1; + /********************************************************* * Preliminaries: @@ -120,8 +131,8 @@ --- a/examples/hcal/local_functions.c +++ b/examples/hcal/local_functions.c @@ -646,62 +646,50 @@ file. Attempting to create a config file - #include - #include // for mkdir, + } + -/************************************************************ -* Open config file, or create one diff --git a/debian/patches/docdir.patch b/debian/patches/docdir.patch index b90e5d2..518bdf4 100644 --- a/debian/patches/docdir.patch +++ b/debian/patches/docdir.patch @@ -4,8 +4,8 @@ --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ SUBDIRS = po docs src examples bindings - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libhdate.pc + libhdate_LDFLAGS = -z relro -z now + -libhdatedocdir = ${prefix}/share/doc/libhdate +libhdatedocdir = ${prefix}/share/doc/libhdate1 diff --git a/debian/patches/fix_3 b/debian/patches/fix_3 deleted file mode 100644 index 168576f..0000000 --- a/debian/patches/fix_3 +++ /dev/null @@ -1,15 +0,0 @@ -Description: Fixes an endless with hcal -3 -Author: Tzafrir Cohen - -On hcal -3 we get padding < 0, and hence an endless loop as it is unsigned. ---- a/examples/hcal/hcal.c -+++ b/examples/hcal/hcal.c -@@ -656,7 +656,7 @@ void print_header_month_line_stdout( con - /************************************************** - * print padding - *************************************************/ -- for (j = 1; j < padding; j++) printf(" "); -+ for (j = 1; j < (int)padding; j++) printf(" "); - - - /************************************************** diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch deleted file mode 100644 index 5895f57..0000000 --- a/debian/patches/manpage.patch +++ /dev/null @@ -1,399 +0,0 @@ -Description: Fix a hyphen used as minus sign (thanks lintian) -Author: Lior Kaplan - ---- a/docs/man/man1/hcal.1 -+++ b/docs/man/man1/hcal.1 -@@ -7,13 +7,13 @@ hcal \- displays a Hebrew / Gregorian ca - .B hcal - [options] [coordinates [timezone]] [[mm] yyyy] - .TP --coordinates: -l [NS]yy[.yyy] -L [EW]xx[.xxx] -+coordinates: \-l [NS]yy[.yyy] \-L [EW]xx[.xxx] - .RE - .RS 7 -- -l [NS]yy[:mm[:ss]] -L [EW]xx[:mm[:ss]] -+ \-l [NS]yy[:mm[:ss]] \-L [EW]xx[:mm[:ss]] - .RE - .RS 7 --timezone: -z nn[( .nn | :mm )] -+timezone: \-z nn[( .nn | :mm )] - .PP - .SH "DESCRIPTION" - .B hcal -@@ -34,78 +34,78 @@ will interpret the given date as a Hebre - .PP - .SH "OPTIONS" - .TP 18 --.B \-1 --one-month --over-ride config file setting if you had set option --three-month as a default there -+.B \-1 \-\-one\-month -+over-ride config file setting if you had set option \-\-three\-month as a default there - .TP --.B \-3 --three-month -+.B \-3 \-\-three\-month - output previous/next months, side by side. requires 127 columns - .TP --.B \-b --bidi -+.B \-b \-\-bidi - output Hebrew information in Hebrew , in reverse - .RE - .RS 7 --.B \ \ \ --visual -+.B \ \ \ \-\-visual - \ sequence - .P - .RE - .RS 7 --.B \ \ \ --no-bidi -+.B \ \ \ \-\-no\-bidi - \ over-ride config file setting if you had set - .RE - .RS 7 --.B \ \ \ --no-visual --\ option -bidi as a default there -+.B \ \ \ \-\-no\-visual -+\ option \-\-bidi as a default there - .TP 18 --.B \-c --colorize -+.B \-c \-\-colorize - output in calming, muted tones - .RE - .RS 7 --.B \ \ \ --no-color -+.B \ \ \ \-\-no\-color - \ over-ride config file setting - .TP 18 --.B \-d --diaspora -+.B \-d \-\-diaspora - use diaspora reading and holidays. Only relevant if hcal is using location information indicating an Israeli timezone - .TP --.B \-f --footnote -+.B \-f \-\-footnote - output descriptive notes of holidays - .RE - .RS 7 --.B \ \ \ --no-footnote -+.B \ \ \ \-\-no\-footnote - \ over-ride config file setting - .TP 18 --.B \-h --html -+.B \-h \-\-html - output in html format to stdout - .RE - .RS 7 --.B \ \ \ --no-html -+.B \ \ \ \-\-no\-html - \ over-ride config file setting - .TP 18 --.B \-H --hebrew --output Hebrew information in Hebrew, in 'logical' sequence. If this displays in reverse for you, use option -b -+.B \-H \-\-hebrew -+output Hebrew information in Hebrew, in 'logical' sequence. If this displays in reverse for you, use option \-b - .TP --.B \-I --israel -+.B \-I \-\-israel - override a diaspora default. Only relevant if hcal is using location information indicating other than an Israeli timezone - .TP - .B \-i - use external css file "./hcal.css" for html output - .TP --.B \ \ \ \--no-reverse -+.B \ \ \ \-\-no\-reverse - do not highlight today's date - .TP --.B \-p --parasha -+.B \-p \-\-parasha - output week's parasha on each calendar row - .TP --.B \-s --shabbat -+.B \-s \-\-shabbat - output Shabbat times and parshiot - .TP --.B \-l --latitude -+.B \-l \-\-latitude - [NS]yy[.yyy] decimal degrees, or [NS]yy[:mm[:ss]] degrees, minutes, seconds. Negative values are South - .TP --.B \-L --longitude -+.B \-L \-\-longitude - [EW]xx[.xxx] decimal degrees, or [EW]xx[:mm[:ss]] degrees, minutes, seconds. Negative values are West - .TP --.B \-z --timezone --\+/-UTC. Notation may be in decimal hours ( hh[.hh] ) or hours, minutes ( hh[:mm] ) -+.B \-z \-\-timezone -+\+/\-UTC. Notation may be in decimal hours ( hh[.hh] ) or hours, minutes ( hh[:mm] ) - .SH NOTES - .SS "HOLIDAYS" - .PP -@@ -153,7 +153,7 @@ Gregorian and Hebrew dates, as follows: - \ Other Israeli National days - .RE - .P --Use the -f (--footnote) option to have hcal describe what any particular day is marking. -+Use the \-f (\-\-footnote) option to have hcal describe what any particular day is marking. - .SS LOCATIONS - If you want - .B hcal -@@ -164,9 +164,9 @@ requires location and time zone informat - uses your computer's local time zone information as an indicator, and either picks a city in that time zone, or defaults to the equator at the center of that time zone. If - .B hcal - can't even retrieve time zone information from your computer, it defaults to Tel-Aviv. For other locations, use the --.B -l -L -+.B \-l \-L - option pair. For other timezones, use the --.B -z -+.B \-z - option. Co-ordinates and standard time zones for some common locations are listed below. - .PP - The current defaults include: -@@ -174,7 +174,7 @@ The current defaults include: - Timezone Default city Lattitude Longitude - .RE - .RS 12 ---5 New York City 40 \-74 -+\-5 New York City 40 \-74 - .RE - .RS 12 - 0 London 51 0 -@@ -191,19 +191,19 @@ Timezone Default city Lattitude Lo - .PP - Useful locations and time zones - .RS 6 --Jerusalem 31, 35, 2 Buenos Aires 34, -58, -3 -+Jerusalem 31, 35, 2 Buenos Aires 34, \-58, \-3 - .RE - .RS 6 - Tel Aviv 32, 34, 2 Hong Kong 22, 114, 8 - .RE - .RS 6 --Haifa 32, 34, 2 Los Angeles 34, -118, -8 -+Haifa 32, 34, 2 Los Angeles 34, \-118, \-8 - .RE - .RS 6 --Beer Sheva 31, 34, 2 Sao Paolo 23, -46, -3 -+Beer Sheva 31, 34, 2 Sao Paolo 23, \-46, \-3 - .RE - .RS 6 --Ashdod 31, 34, 2 Toronto 43, -79 -5 -+Ashdod 31, 34, 2 Toronto 43, \-79 \-5 - .RS 6 - .RE - Tiberias 32, 35, 2 -@@ -233,18 +233,18 @@ The timezone support is currenlty primit - .TP 10 - .B Historical - The software does not yet account for the phenomenon and complications of the "Gregorian transition" from the prior, Julian calendar, which effectively caused an instantaneous 'loss' of two weeks for all gentiles affected. Countries (eg. Poland, Spain and Italy) began adopting the Gregorian calendar on 8 Tishrei 5343 (4 October 1582CE), although many did not transition until the 56th century (1752 CE, eg. UK colonies, Sweden). Russia did not adopt the Gregorian calendar until 5678 (1918 CE) and Turkey did not until 5687 (December, 1926 CE). Many other countries made the transition on other dates. Keep in mind that Russia invaded part of Poland, undoing, for the interim, the Gregorian transition for (only) that part of Poland; Also important to remember in this regard is that Eretz Ysroel was part of the Turkish Ottoman empire until the British mandate (5677 (1917CE)). Until all this is accounted for adequately by this application, refer to ' --.B ncal -p -+.B ncal \-p - \' for a basic table of country transitions. However, keep in mind that European borders underwent many changes during the 426 years in question, so the accuracy of your data will depend on accurate knowledge of whether any particular date at any specific location was Julian or Gregorian. - .SH "EXAMPLES" - .TP 3 - 1. Display a 2012ce year's calendar, three-months wide, in color. - .RS 6 --.B hcal -3c 2012 -+.B hcal \-3c 2012 - .RE - .HP 3 - 2. Display the current month's calendar, with Shabbat times, parshiot, footnoted holiday identification, with Hebrew information in Hebrew, and all in "calming", "muted" color-tones. - .RS 6 --.B hcal -csfH -+.B hcal \-csfH - .SH "SEE ALSO" - mlterm(1), hdate(1), hebcal(1), date(1), ncal(1), cal(1), remind(1) - .SH "AUTHORS" ---- a/docs/man/man3/hdate.h.3 -+++ b/docs/man/man3/hdate.h.3 -@@ -999,7 +999,7 @@ a static string with name of translator, - .PP - helper function to find hebrew locale \fBReturns:\fP - .RS 4 --0 - latin locale, -1 - hebrew locale -+0 - latin locale, \-1 - hebrew locale - .RE - .PP - ---- a/docs/man/man1/hdate.1 -+++ b/docs/man/man1/hdate.1 -@@ -9,13 +9,13 @@ hdate \- displays Hebrew date informatio - .B hdate - [options] [coordinates [timezone]] [ julian_day ] - .TP --coordinates: -l [NS]yy[.yyy] -L [EW]xx[.xxx] -+coordinates: \-l [NS]yy[.yyy] \-L [EW]xx[.xxx] - .RE - .RS 7 -- -l [NS]yy[:mm[:ss]] -L [EW]xx[:mm[:ss]] -+ \-l [NS]yy[:mm[:ss]] \-L [EW]xx[:mm[:ss]] - .RE - .RS 7 --timezone: -z nn[( .nn | :mm )] -+timezone: \-z nn[( .nn | :mm )] - .PP - .SH "DESCRIPTION" - .B hdate -@@ -45,79 +45,79 @@ will interpret it as the "Julian day num - .PP - .SH "OPTIONS" - .TP 18 --.B \-b --bidi -+.B \-b \-\-bidi - output Hebrew information in Hebrew, but in reverse - .RE - .RS 7 --.B \ \ \ --visual -+.B \ \ \ \-\-visual - \ sequence. - .TP 18 - .B \-c - print Shabbat start/end times. Shabbat starts 20 min before sunset, - and ends when three stars are out. - .TP --.B \-d --diaspora -+.B \-d \-\-diaspora - use diaspora reading and holidays. - .TP --.B \-h --holidays -+.B \-h \-\-holidays - print holidays. - .TP - .B \-H - Print only if it is a holiday. - .TP --.B \-i --ical -+.B \-i \-\-ical - use iCal formatted output. - .TP --.B \-j --julian -+.B \-j \-\-julian - print Julian day number. - .TP --.B \-o --omer -+.B \-o \-\-omer - print Sefirat Ha Omer - .TP --.B \-q --quiet-alerts -+.B \-q \-\-quiet\-alerts - quiet. suppress warning messages - .TP --.B \-r --parasha -+.B \-r \-\-parasha - print weekly reading for Shabbat. - .TP - .B \-R - print only if the weekly reading is read on that Shabbat - .TP --.B \-s --sun -+.B \-s \-\-sun - print sunrise/sunset times. - .TP --.B \-S --short-format -+.B \-S \-\-short\-format - print using short format. - .TP - .B \-t - print day times: first light, talit, sunrise, mid day, sunset, first stars, three stars - .TP --.B \-T --table -+.B \-T \-\-table - print tabular output. All data for each requested day will be output on a single comma-delimited line. - Most suitable for piping, or export to spreadsheets\n\n\ - .TP --.B \-l --latitude -+.B \-l \-\-latitude - [NS]yy[.yyy] decimal degrees, or [NS]yy[:mm[:ss]] degrees, minutes, seconds. Negative values are South - .TP --.B \-L --longitude -+.B \-L \-\-longitude - [EW]xx[.xxx] decimal degrees, or [EW]xx[:mm[:ss]] degrees, minutes, seconds. Negative values are West - .TP --.B \-z --timezone --\+/-UTC. Notation may be in decimal hours ( hh[.hh] ) or hours, minutes ( hh[:mm] ) -+.B \-z \-\-timezone -+\+/\-UTC. Notation may be in decimal hours ( hh[.hh] ) or hours, minutes ( hh[:mm] ) - .TP --.B \ \ --hebrew -+.B \ \ \-\-hebrew - forces Hebrew to print in Hebrew characters - .TP --.B \ \ --yom -+.B \ \ \-\-yom - force Hebrew prefix to Hebrew day of week - .TP --.B \ \ --leshabbat -+.B \ \ \-\-leshabbat - insert parasha between day of week and day - .TP --.B \ \ --leseder -+.B \ \ \-\-leseder - insert parasha between day of week and day - .TP --.B \ \ --not-sunset-aware -+.B \ \ \-\-not\-sunset\-aware - don't display next day if after sunset - .SH NOTES - .SS LOCATIONS -@@ -130,9 +130,9 @@ requires location and time zone informat - uses your computer's local time zone information as an indicator, and either picks a city in that time zone, or defaults to the equator at the center of that time zone. If - .B hdate - can't even retrieve time zone information from your computer, it defaults to Tel-Aviv. For other locations, use the --.B -l -L -+.B \-l \-L - option pair. For other timezones, use the --.B -z -+.B \-z - option. Co-ordinates and standard time zones for some common locations are listed below. - .PP - The current defaults include: -@@ -140,7 +140,7 @@ The current defaults include: - Timezone Default city Lattitude Longitude - .RE - .RS 12 ---5 New York City 40 \-74 -+\-5 New York City 40 \-74 - .RE - .RS 12 - 0 London 51 0 -@@ -157,19 +157,19 @@ Timezone Default city Lattitude Lo - .PP - Useful locations and time zones - .RS 6 --Jerusalem 31, 35, 2 Buenos Aires 34, -58, -3 -+Jerusalem 31, 35, 2 Buenos Aires 34, \-58, \-3 - .RE - .RS 6 - Tel Aviv 32, 34, 2 Hong Kong 22, 114, 8 - .RE - .RS 6 --Haifa 32, 34, 2 Los Angeles 34, -118, -8 -+Haifa 32, 34, 2 Los Angeles 34, \-118, \-8 - .RE - .RS 6 --Beer Sheva 31, 34, 2 Sao Paolo 23, -46, -3 -+Beer Sheva 31, 34, 2 Sao Paolo 23, \-46, \-3 - .RE - .RS 6 --Ashdod 31, 34, 2 Toronto 43, -79 -5 -+Ashdod 31, 34, 2 Toronto 43, \-79 \-5 - .RS 6 - .RE - Tiberias 32, 35, 2 -@@ -199,17 +199,17 @@ The timezone support is currenlty primit - .TP 10 - .B Historical - The software does not yet account for the phenomenon and complications of the "Gregorian transition" from the prior, Julian calendar, which effectively caused an instantaneous 'loss' of two weeks for all gentiles affected. Countries (eg. Poland, Spain and Italy) began adopting the Gregorian calendar on 8 Tishrei 5343 (4 October 1582CE), although many did not transition until the 56th century (1752 CE, eg. UK colonies, Sweden). Russia did not adopt the Gregorian calendar until 5678 (1918 CE) and Turkey did not until 5687 (December, 1926 CE). Many other countries made the transition on other dates. Keep in mind that Russia invaded part of Poland, undoing, for the interim, the Gregorian transition for (only) that part of Poland; Also important to remember in this regard is that Eretz Ysroel was part of the Turkish Ottoman empire until the British mandate (5677 (1917CE)). Until all this is accounted for adequately by this application, refer to ' --.B ncal -p -+.B ncal \-p - \' for a basic table of country transitions. However, keep in mind that European borders underwent many changes during the 426 years in question, so the accuracy of your data will depend on accurate knowledge of whether any particular date at any specific location was Julian or Gregorian. - .SH "EXAMPLES" - 1. Create an iCal calendar of the holidays of year 2025. - .RS 6 --.B hdate -Hi 2025 -+.B hdate \-Hi 2025 - .RE - .HP 3 - 2. Print out the weekly readings and sunset/sunrise times for Eilat, on April 2031. - .RS 6 --.B hdate -sR 4 2031 -l29 -L34 -z2 -+.B hdate \-sR 4 2031 \-l29 \-L34 \-z2 - .RE - .SH "SEE ALSO" - mlterm(1), hcal(1), hebcal(1), date(1), ncal(1), cal(1), remind(1) diff --git a/debian/patches/missing_format.patch b/debian/patches/missing_format.patch deleted file mode 100644 index 2bb0dd1..0000000 --- a/debian/patches/missing_format.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Use an explicit format string when printing config file -Author: Tzafrir Cohen - -The call to print the default configuration text to the configuration file -should use an explicit "%s". However the text comes from the code and does -not happen to contain any '%' sign, so it is not explitable. ---- a/examples/hcal/local_functions.c -+++ b/examples/hcal/local_functions.c -@@ -676,7 +676,7 @@ FILE* get_config_file( const char* confi - error(0, errno, "%s: %s", N_("failure attempting to create config file"), config_file_path); - return; - } -- fprintf(config_file, default_config_file_text); -+ fprintf(config_file, "%s", default_config_file_text); - error(0,0,"%s: %s",N_("config file created"), config_file_path); - if (fclose(config_file) != 0) error(0,errno,"%s %s",N_("failure closing"),config_file_name); - } diff --git a/debian/patches/nested_extern.patch b/debian/patches/nested_extern.patch deleted file mode 100644 index 0d4e7cc..0000000 --- a/debian/patches/nested_extern.patch +++ /dev/null @@ -1,31 +0,0 @@ -Description: Do not include headers inside a function. -Author: Tzafrir Cohen - -If you #include unistd.h inside a function, the declerations made in it -can be considered nested functions. ---- a/examples/hcal/local_functions.c -+++ b/examples/hcal/local_functions.c -@@ -641,6 +641,11 @@ file. Attempting to create a config file - } - - -+#include // for get pwuid -+#include // for getuid -+#include -+#include // for mkdir, -+ - /************************************************************ - * Open config file, or create one - * - returns filepointer or NULL -@@ -650,11 +655,6 @@ FILE* get_config_file( const char* confi - const char* config_file_name, - const char* default_config_file_text ) - { --#include // for get pwuid --#include // for getuid --#include --#include // for mkdir, -- - size_t path_len; - - char* config_home_path_name = ""; diff --git a/debian/patches/series b/debian/patches/series index 1b757c5..a95c579 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,12 +1,8 @@ docdir.patch ld-as-needed.patch -manpage.patch -fix_3 time_t.patch typos.patch cflags.patch duplicate_gnu_source.patch size_t.patch -nested_extern.patch -missing_format.patch clang.patch diff --git a/debian/patches/size_t.patch b/debian/patches/size_t.patch index b4a7e3d..70b7b66 100644 --- a/debian/patches/size_t.patch +++ b/debian/patches/size_t.patch @@ -6,12 +6,12 @@ #define DEBUG 0 #if DEBUG --printf("\nrevstr: entry: sourcelen = %d, source = %s\n",source_len, source); +-printf("\nrevstr: entry: sourcelen = %ld, source = %s\n",source_len, source); +printf("\nrevstr: entry: sourcelen = %zd, source = %s\n",source_len, source); #endif if (source == NULL) {error(0,0,"revstr: source buffer pointer is NULL"); exit(0);}; -- if (source_len <= 0) {error(0,0,"revstr: source_len parameter invalid, %d",source_len); exit(0);}; +- if (source_len <= 0) {error(0,0,"revstr: source_len parameter invalid, %ld",source_len); exit(0);}; + if (source_len <= 0) {error(0,0,"revstr: source_len parameter invalid, %zd",source_len); exit(0);}; size_t i,j; @@ -20,28 +20,8 @@ memcpy(source, temp_buff, source_len); source[source_len] = '\0'; #if DEBUG --printf("\nrevstr: before free(tempbuff): sourcelen = %d, source = %s\n",source_len, source); +-printf("\nrevstr: before free(tempbuff): sourcelen = %ld, source = %s\n",source_len, source); +printf("\nrevstr: before free(tempbuff): sourcelen = %zd, source = %s\n",source_len, source); #endif free(temp_buff); return; ---- a/examples/hcal/hcal.c -+++ b/examples/hcal/hcal.c -@@ -1135,7 +1135,7 @@ void print_week( int jd, const int month - // padding - FIXME - spaces are single-byte, while - // the Hebrew characters are two bytes - const int margin_max = 15; -- printf("%*s%s", (margin_max - shabbat_name_str_len/2)," ", shabbat_name_buffer); -+ printf("%*s%s", (int) (margin_max - shabbat_name_str_len/2)," ", shabbat_name_buffer); - - free(shabbat_name_buffer); - } -@@ -1344,7 +1344,7 @@ int print_month ( const int month, const - // padding - FIXME - spaces are single-byte, while - // the Hebrew characters are two bytes - const int margin_max = 16; // 15 fails because of jabotinsky in july -- printf("%*s%s\n", (margin_max - holiday_str_len/2)," ", holiday_buffer); -+ printf("%*s%s\n", (int) (margin_max - holiday_str_len/2)," ", holiday_buffer); - - free(holiday_buffer); - }