# # # patch ".mtn-ignore" # from [8d76d2540f0c737a188b670a78eb969e0baa57a4] # to [48d461ab5590a8e01a5e5b804813bbbd031cdb44] # # patch "debian/changelog" # from [aac674902d1db7669b2398fe485f6697cfff58d2] # to [6dd849d90877b06ce2b9ef7ee9aa65071ef6102f] # # patch "debian/control" # from [222a0fe9a7cf363ae803d763145e82b4554eb33b] # to [62318b78abab9543f3cbc183c190230e499bb5f9] # # patch "debian/rules" # from [5ccfa63d48112f0275bc04dac651b06583d08566] # to [0bd97c7aaece3021a5522460346ad25a8abc8bb4] # # patch "debian/shlibs.local" # from [08938a843783bffb941e32b07e68bdc0bf60408e] # to [2a7d8d814dea85f7a13311fb1b4e29ac915c58c4] # # patch "m4/pcre.m4" # from [692cc1d5069148e2c9fa0c1cf4870db7a4d6d5cb] # to [beb5310e881b21a03007ca3ae670f1899bf60ed0] # ============================================================ --- .mtn-ignore 8d76d2540f0c737a188b670a78eb969e0baa57a4 +++ .mtn-ignore 48d461ab5590a8e01a5e5b804813bbbd031cdb44 @@ -1,54 +1,19 @@ -testsuite\.dir -tester_dir -^build$ -^build/ -\.dirstamp -^txt2c$ -^unit_tests$ -^unit_tests\.log$ -^mtn$ -^testsuite$ -^testsuite\.log$ -^tester$ -^tester\.h$ -^run_lua_tests$ -^run_tester_tests$ -^package_full_revision(\.c|\.txt|_dist\.txt|_raw\.txt)$ -^package_revision_raw.txt$ -^config\. -^configure$ -^schema.h$ -^(std|test)_hooks.h$ -^Makefile$ -^Makefile\.in$ -^texinfo.tex$ -^version.texi$ -^stamp- -/stamp- -^monotone\.info -^monotone\.html$ +\.dirstamp$ +^ABOUT-NLS$ +^Makefile(\.in)?$ +^aclocal\.m4$ +^build-arch-stamp$ +^build-indep-stamp$ ^compile$ +^config\.(guess|h(\.in)?|log|rpath|status|sub)$ +^configure$ +^debian/files$ +^debian/monotone +^debian/monotone\.substvars$ ^depcomp$ +^html ^install-sh$ -^mkinstalldirs$ -^missing$ -^package_revision\.(c|txt)$ -^mdate.sh$ -^tests/atconfig$ -^tests/atlocal$ -^ABOUT-NLS$ -^mt-stdint.h$ -^po/monotone.pot$ -^po/.*\.sed$ -^po/Makefile(\.in)*$ -^po/.*\.gmo$ -^po/Makevars.template$ -^po/.*\.header$ -^po/POTFILES$ -^po/Rules-quot$ -^po/insert-header.sin$ -^aclocal\.m4$ -^package\.m4$ +^lua_tests\.status$ ^m4/codeset\.m4$ ^m4/gettext\.m4$ ^m4/glibc21\.m4$ @@ -66,3 +31,36 @@ tester_dir ^m4/stdint_h\.m4$ ^m4/uintmax_t\.m4$ ^m4/ulonglong\.m4$ +^mdate-sh$ +^missing$ +^mkinstalldirs$ +^monotone\.(cps?|fn|ky|pg|tp|vr|toc|pdf|ps|dvi|log|info(-[0-9]+)?)$ +^mtn$ +^package_(full_)?revision(\.c|\.txt|_(dist|raw)\.txt)$ +^po/Makefile(\.in)*$ +^po/POTFILES$ +^po/Rules-quot$ +^po/boldquot\.sed$ +^po/address@hidden +^po/address@hidden +^po/insert-header\.sin$ +^po/monotone\.pot$ +^po/quot\.sed$ +^run_lua_tests$ +^run_tester_tests$ +^run_unit_tests$ +^schema\.c$ +^stamp-h1$ +^stamp-vti$ +^std_hooks\.c$ +^test_hooks\.c$ +^tester$ +^tester_dir$ +^tester_tests\.status$ +^testlib\.c$ +^texinfo\.tex$ +^txt2c$ +^unit-tests$ +^unit_tester$ +^unit_tests\.status$ +^version\.texi$ ============================================================ --- debian/changelog aac674902d1db7669b2398fe485f6697cfff58d2 +++ debian/changelog 6dd849d90877b06ce2b9ef7ee9aa65071ef6102f @@ -1,9 +1,7 @@ monotone (0.39-1) UNRELEASED; urgency=lo monotone (0.39-1) UNRELEASED; urgency=low * New upstream release. - * Enable use of system libpcre, set appropriate Build-Depends. Note - use of tight B-Ds and shared library dependencies, consistent - with behavior of upstream configure script. + * Enable use of system libpcre, set appropriate Build-Depends. -- J Maintainer ???, ?? ??? ???? ??:??:?? +???? ============================================================ --- debian/control 222a0fe9a7cf363ae803d763145e82b4554eb33b +++ debian/control 62318b78abab9543f3cbc183c190230e499bb5f9 @@ -6,8 +6,7 @@ Build-Depends: debhelper (>= 4.2.0), aut Homepage: http://monotone.ca/ Vcs-Browser: http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone Build-Depends: debhelper (>= 4.2.0), autotools-dev, libz-dev, po-debconf, - libboost-dev (>= 1.34.1-2), libpcre3-dev (>= 7.6), libpcre3-dev (<< 7.7), - patch + libboost-dev (>= 1.34.1-2), libpcre3-dev (>= 7.6), patch Build-Depends-Indep: ps2eps, texlive-base, texlive-generic-recommended, texlive-latex-base, texinfo, xpdf-utils Standards-Version: 3.7.3 ============================================================ --- debian/rules 5ccfa63d48112f0275bc04dac651b06583d08566 +++ debian/rules 0bd97c7aaece3021a5522460346ad25a8abc8bb4 @@ -64,16 +64,6 @@ build: build-arch # tried it with actual root privileges and don't propose to). build: build-arch -# Note regarding PCRE: monotone upstream wants tight control over -# which version of the library is used with any given release of the -# program. In --with-system-pcre mode, configure will error out if it -# finds any version other than the one bundled with the program. This -# is why the package has both >= and << build-dependencies on -# libpcre3-dev. There is a documented way to override this, should it -# be necessary for e.g. security NMUs: see m4/pcre.m4. You will also -# need to change the build dependencies in debian/control *and* the -# shared library dependencies override in debian/shlibs.local. - config.status: configure dh_testdir ifneq "$(wildcard /usr/share/misc/config.sub)" "" ============================================================ --- debian/shlibs.local 08938a843783bffb941e32b07e68bdc0bf60408e +++ debian/shlibs.local 2a7d8d814dea85f7a13311fb1b4e29ac915c58c4 @@ -1 +1,3 @@ -libpcre 3 libpcre3 (>= 7.6), libpcre3 (<< 7.7) +# libpcre's own shlibs file requires only >=7.4, but we want to be sure +# to get the security fixes in 7.5 and 7.6. +libpcre 3 libpcre3 (>= 7.6) ============================================================ --- m4/pcre.m4 692cc1d5069148e2c9fa0c1cf4870db7a4d6d5cb +++ m4/pcre.m4 beb5310e881b21a03007ca3ae670f1899bf60ed0 @@ -1,25 +1,10 @@ # Set up to use either a bundled or a system-provided version of libpcre. # -# If --with-system-pcre is specified and the library cannot be found or is -# unsuitable, the configure script will error out rather than falling back -# to the bundled version. This is to avoid surprising a user who expected -# their system libpcre to be used. -# -# "Unsuitable" is defined as "any version other than the bundled one". In -# other words, if you want to use a system PCRE you must provide the exact -# same version that was shipped with this release of Monotone. We do this -# because regexes are part of the visible user interface, but their syntax -# may change from release to release of PCRE. We want each version of our -# program to exhibit the regex syntax that was documented in its manual. -# -# If you want to rebuild monotone with a newer system PCRE to get some bug -# fixes, and you've verified that the newer version of PCRE doesn't change -# the regex syntax, you can override the check by changing the #defines in -# pcre/pcre.h that state the bundled library's version number. You do not -# have to regenerate 'configure'. -# -# We are discussing this with the upstream maintainers of PCRE and hope to -# find a better solution soon. +# If --with-system-pcre is specified and the library cannot be found +# or is unsuitable, the configure script will error out rather than +# falling back to the bundled version. This is to avoid surprising a +# user who expected their system libpcre to be used. "Unsuitable" is +# defined as "any version older than the bundled one". AC_DEFUN([MTN_LIB_PCRE], [AC_ARG_WITH([system-pcre], @@ -110,7 +95,7 @@ AC_DEFUN([MTN_FIND_PCRE], fi # This is deliberately not cached. - AC_MSG_CHECKING([whether the system libpcre matches the bundled version]) + AC_MSG_CHECKING([whether the system libpcre is new enough]) sed -n -e 's/#define PCRE_MAJOR[ ]*/#define BUNDLED_PCRE_MAJOR /p' \ -e 's/#define PCRE_MINOR[ ]*/#define BUNDLED_PCRE_MINOR /p' \ $srcdir/pcre/pcre.h > conftest.h @@ -119,13 +104,14 @@ AC_DEFUN([MTN_FIND_PCRE], AC_PREPROC_IFELSE([ #include "conftest.h" #include "pcre.h" -#if PCRE_MAJOR != BUNDLED_PCRE_MAJOR || PCRE_MINOR != BUNDLED_PCRE_MINOR -#error PCRE version mismatch +#if PCRE_MAJOR < BUNDLED_PCRE_MAJOR || \ + (PCRE_MAJOR == BUNDLED_PCRE_MAJOR && PCRE_MINOR < BUNDLED_PCRE_MINOR) +#error out of date #endif], [pcre_version_match=yes], [pcre_version_match=no]) AC_MSG_RESULT($pcre_version_match) if test $pcre_version_match = no; then - AC_MSG_ERROR([system-provided libpcre does not match bundled pcre. Correct your settings, use --with-system-pcre=no, or read m4/pcre.m4 for advice.]) + AC_MSG_ERROR([system-provided libpcre is too old. Upgrade it, correct your settings, or use --with-system-pcre=no.]) fi ])