[med-svn] r10074 - in trunk/packages/theseus/trunk/debian: . patches
Andreas Tille
tille at alioth.debian.org
Sat Mar 24 07:32:55 UTC 2012
Author: tille
Date: 2012-03-24 07:32:55 +0000 (Sat, 24 Mar 2012)
New Revision: 10074
Added:
trunk/packages/theseus/trunk/debian/patches/20_hardening.patch
Modified:
trunk/packages/theseus/trunk/debian/changelog
trunk/packages/theseus/trunk/debian/compat
trunk/packages/theseus/trunk/debian/control
trunk/packages/theseus/trunk/debian/patches/series
Log:
Debhelper 9 to enable hardening; Hardening requires code patches which is NOT YET FINISHED (so it does not build as is)
Modified: trunk/packages/theseus/trunk/debian/changelog
===================================================================
--- trunk/packages/theseus/trunk/debian/changelog 2012-03-24 07:23:37 UTC (rev 10073)
+++ trunk/packages/theseus/trunk/debian/changelog 2012-03-24 07:32:55 UTC (rev 10074)
@@ -8,6 +8,10 @@
which is not needed with source version 3.0 (quilt)
* debian/upstream: Use information from debian/citation.bib
for References in upstream yaml format
+ * debian/upstream: Use information from debian/citation.bib
+ for References in upstream yaml format
+ * debian/{control,compat}: debhelper 9 to enable hardening
+ flags
-- Andreas Tille <tille at debian.org> Sat, 24 Mar 2012 07:48:57 +0100
Modified: trunk/packages/theseus/trunk/debian/compat
===================================================================
--- trunk/packages/theseus/trunk/debian/compat 2012-03-24 07:23:37 UTC (rev 10073)
+++ trunk/packages/theseus/trunk/debian/compat 2012-03-24 07:32:55 UTC (rev 10074)
@@ -1 +1 @@
-7
+9
Modified: trunk/packages/theseus/trunk/debian/control
===================================================================
--- trunk/packages/theseus/trunk/debian/control 2012-03-24 07:23:37 UTC (rev 10073)
+++ trunk/packages/theseus/trunk/debian/control 2012-03-24 07:32:55 UTC (rev 10074)
@@ -5,7 +5,7 @@
Uploaders: Morten Kjeldgaard <mok0 at ubuntu.com>,
Andreas Tille <tille at debian.org>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.1), libgsl0-dev
+Build-Depends: debhelper (>= 9), libgsl0-dev
Standards-Version: 3.9.3
Homepage: http://www.theseus3d.org
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/theseus/trunk/
Added: trunk/packages/theseus/trunk/debian/patches/20_hardening.patch
===================================================================
--- trunk/packages/theseus/trunk/debian/patches/20_hardening.patch (rev 0)
+++ trunk/packages/theseus/trunk/debian/patches/20_hardening.patch 2012-03-24 07:32:55 UTC (rev 10074)
@@ -0,0 +1,142 @@
+--- theseus_src.orig/libdistfit/chisqrgen_dist.c
++++ theseus_src/libdistfit/chisqrgen_dist.c
+@@ -161,7 +161,7 @@
+ double
+ chisqrgen_fit(const double *data, const int num, double *nu, double *lambda, double *prob)
+ {
+- double ave, var, logterm, fx, dfx, guess_nu, guess_lambda;
++ double ave, var, logterm, fx, dfx, guess_nu;
+ int i;
+ double iter = 100;
+ double tol = 1e-8;
+@@ -187,7 +187,7 @@
+ var /= (double) num;
+
+ guess_nu = *nu = 2.0 * ave * ave / var;
+- guess_lambda = *lambda = 0.5 * var / ave;
++ *lambda = 0.5 * var / ave;
+
+ logterm = 0.0;
+ for (i = 0; i < num; ++i)
+--- theseus_src.orig/libdistfit/gamma_dist.c
++++ theseus_src/libdistfit/gamma_dist.c
+@@ -418,7 +418,7 @@
+ double
+ gamma_fit(const double *data, const int num, double *b, double *c, double *logL)
+ {
+- double ave, /* var, */logterm, logdata, fx, dfx, fxdfx, guess_b, guess_c;
++ double ave, /* var, */logterm, logdata, fx, dfx, fxdfx/*, guess_b, guess_c*/;
+ int i, maxiter = 500;
+ double tol = FLT_EPSILON;
+
+@@ -465,8 +465,8 @@
+ if (*c > FLT_MAX)
+ *c = FLT_MAX;
+
+- guess_b = *b;
+- guess_c = *c;
++ /* guess_b = *b; */
++ /* guess_c = *c; */
+
+ /* Maximum likelihood fit. */
+ /* Use Newton-Raphson to find ML estimate of c
+@@ -550,7 +550,7 @@
+ void
+ gamma_fit_no_stats(const double *data, const int num, double *b, double *c)
+ {
+- double ave, /* var, */logterm, logdata, fx, dfx, fxdfx, guess_b, guess_c;
++ double ave, /* var, */logterm, logdata, fx, dfx, fxdfx/*, guess_b, guess_c*/;
+ int i, maxiter = 500;
+ double tol = FLT_EPSILON;
+
+@@ -607,8 +607,8 @@
+ if (*c > FLT_MAX)
+ *c = FLT_MAX;
+
+- guess_b = *b;
+- guess_c = *c;
++ /* guess_b = *b; */
++ /* guess_c = *c; */
+ /* Maximum likelihood fit. */
+ /* Use Newton-Raphson to find ML estimate of c
+ Based on _Statistical Distributions_ 3rd ed. Evans, Hastings, and Peacock, p 41.
+@@ -701,7 +701,7 @@
+ void
+ gamma_bayes_fit_no_stats(const double *data, const int num, double *b, double *c)
+ {
+- double ave, /* var, */logterm, logdata, fx, dfx, fxdfx, guess_b, guess_c;
++ double ave, /* var, */logterm, logdata, fx, dfx, fxdfx/*, guess_b, guess_c*/;
+ int i, maxiter = 500;
+ double tol = FLT_EPSILON;
+
+@@ -758,8 +758,8 @@
+ if (*c > FLT_MAX)
+ *c = FLT_MAX;
+
+- guess_b = *b;
+- guess_c = *c;
++ /* guess_b = *b; */
++ /* guess_c = *c; */
+ /* Bayesian maximum posterior probability fit.
+ Use Newton-Raphson to find ML estimate of c.
+
+@@ -837,7 +837,7 @@
+ void
+ gamma_bayes_ref_fit_no_stats(const double *data, const int num, double *b, double *c)
+ {
+- double sumx, /* var, */logterm, logdata, fx, dfx, fxdfx, guess_b, guess_c;
++ double sumx, /* var, */logterm, logdata, fx, dfx, fxdfx/*, guess_b, guess_c*/;
+ int i, maxiter = 500;
+ double tol = FLT_EPSILON;
+
+@@ -892,8 +892,8 @@
+ if (*c > FLT_MAX)
+ *c = FLT_MAX;
+
+- guess_b = *b;
+- guess_c = *c;
++ /* guess_b = *b; */
++ /* guess_c = *c; */
+ /* Bayesian maximum posterior probability fit.
+ Use Newton-Raphson to find ML estimate of c.
+
+--- theseus_src.orig/libdistfit/invgamma_dist.c
++++ theseus_src/libdistfit/invgamma_dist.c
+@@ -764,7 +764,7 @@
+ double
+ invgamma_EMsmall_fit(const double *data, const int numt, int missing, double *b, double *c, double *logL)
+ {
+- double sum_ln, sum_inv, ave_ln, ave_inv, harm_ave, x;
++ double sum_ln, sum_inv, ave_ln, /* ave_inv, */ harm_ave, x;
+ double *newdata = malloc(numt * sizeof(double));
+ double chi2 = 0.0, xn1, expinvxn, explogxn;
+ double fx = 0.0, dfx = 1.0, fxdfx = 0.0;
+@@ -798,7 +798,7 @@
+ numm = numt - missing;
+
+ ave_ln = sum_ln / numm;
+- ave_inv = sum_inv / numm;
++ /* ave_inv = sum_inv / numm; */
+ harm_ave = numm / sum_inv;
+
+ /* MMEs are:
+--- theseus_src.orig/libdistfit/lognormal_dist.c
++++ theseus_src/libdistfit/lognormal_dist.c
+@@ -128,7 +128,7 @@
+ double
+ lognormal_fit(const double *data, const int num, double *zeta, double *sigma, double *prob)
+ {
+- double ave, avesqr, var, /* m, */ x, theta;
++ double ave, avesqr, var, /* m, */ x/*, theta*/;
+ int i;
+
+ ave = avesqr = 0.0;
+@@ -165,7 +165,7 @@
+
+ *zeta = ave;
+ *sigma = sqrt(var);
+- theta = 0.5*(sqrt(1.0 + 4.0*avesqr) - 1.0);
++ /* theta = 0.5*(sqrt(1.0 + 4.0*avesqr) - 1.0); */
+ /* printf(" LogNormal theta: %f %e\n", theta, theta*theta + theta - avesqr); */
+ /* printf("\n LogNormal logL: %f", lognormal_logL(*zeta, *sigma)); */
+
Modified: trunk/packages/theseus/trunk/debian/patches/series
===================================================================
--- trunk/packages/theseus/trunk/debian/patches/series 2012-03-24 07:23:37 UTC (rev 10073)
+++ trunk/packages/theseus/trunk/debian/patches/series 2012-03-24 07:32:55 UTC (rev 10074)
@@ -1 +1,2 @@
10_kbsd.patch
+20_hardening.patch
More information about the debian-med-commit
mailing list