Skip to content
This repository
Browse code

Add patches from trac 13731 to libsingular

Package-Manager: portage-2.2.0_alpha144
  • Loading branch information...
commit 0b82d1c563c2fb8f487f6476039711e668c6219b 1 parent 4e3134b
François Bissey authored December 07, 2012
8  sci-libs/libsingular/ChangeLog
@@ -2,6 +2,14 @@
2 2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
3 3
 # $Header: $
4 4
 
  5
+*libsingular-3.1.5-r1 (07 Dec 2012)
  6
+
  7
+  07 Dec 2012; François Bissey <francois.bissey@canterbury.ac.nz>
  8
+  +files/singular_15435.patch,
  9
+  +files/singular_part_of_changeset_baadc0f7.patch, -libsingular-3.1.5.ebuild,
  10
+  +libsingular-3.1.5-r1.ebuild:
  11
+  add patches from trac 13731
  12
+
5 13
   21 Nov 2012; François Bissey <francois.bissey@canterbury.ac.nz>
6 14
   -libsingular-3.1.3.3-r2.ebuild, -files/singular-3.1.3.3-os_x_ppc.patch,
7 15
   -libsingular-3.1.4.ebuild:
6  sci-libs/libsingular/Manifest
@@ -3,11 +3,13 @@ AUX singular-3.1.3.3-Minor.h.patch 234 SHA256 87419ec7ec7c51672c77dee048e1ca4dfa
3 3
 AUX singular-3.1.3.3-dylib.patch 659 SHA256 123c55bd0315c6f417d5bed813ce326a08415eeb5f1dd6f7c3f4d52ef33d93df SHA512 ab4db1f85a43a8b2263afd25a6453fc18ae8d86765a38621472edd3e72e1b96a069a19dc666e9d63b1972d106159a29d20de11a2c23763ce38a5aefa546d5a87 WHIRLPOOL 8eef172e9f082022c654b9c42ffef1e95eb360131e959e1875f4660b139ba0886cf203b9b8cbf66361a2a9209be205c2db1bf12967faa7e13d69b9d7a89d31c0
4 4
 AUX singular-3.1.3.3-soname.patch 610 SHA256 cd127652b4a9c909730f7e7af94174261b9eef909826f410779c75a3ca56e188 SHA512 8c250e7cbaee47995a87e7139a2635e332d5839de4c29afab107247a26639eaecc2639220bbd45185c8c651de5710776120f7ce9828543700ce6c495a5b35f2d WHIRLPOOL e8892ee2082c61237736fac62e568138ee37fa844563660b8bd183c92d7627359afc714544f0dacde75795b5b47c1d3d32e85dcaa208e4501e1a174bd8647c45
5 5
 AUX singular-3.1.5-NTLnegate.patch 857 SHA256 071d1da21005377e949df8279ba75ad325a9581bb2d5f2603fa88803c3cc24de SHA512 8a9937140cef47bb356c7605c47199460f6990f29bbfac1127d7e6977087b28c7d529598d7b6ce193010d1e54e55f2c134a771e69e991914187a56ae60f041ee WHIRLPOOL 608c9f3a67a92f64496ac6385da9e54fadddbbcb09e277ef0e3e604291e50d646d9f98896e93288e87e936ba0d4baa716c62b913958e7ce531c35824cb75ef5c
  6
+AUX singular_15435.patch 3787 SHA256 cd48e77979bd95fc7ca24ecb75744c2b89bae6e57425d7400f3ac0b09029abe1 SHA512 545ea47870e0d3527ce1b561ed282367c7c28bcdecc833d1be72d14d8c27d7aa6a548250f99c495f3f36f294cf19288118a16250214cb454b7086e47131d0ea3 WHIRLPOOL 0fe156bac87f9344663766e2a1fc8685ac32c62a3905fad82e88ed2395296517408aae6561264268e0ddc2033e5147b5778ecbb9928d2f92801540b11cf2d2a1
  7
+AUX singular_part_of_changeset_baadc0f7.patch 645 SHA256 938d3a01e33b93c7d39541826344567bd979bbd703f4557b683ab48421414d71 SHA512 bdf644a360920d3ca98f7ad4ea29b236c753dfbb0dcc5b0987fa0527b92cef4b26b9f2f4fbc1adad72b0fbd6160ef12189d4edf94dc8d2e347ac7ffa19138c7c WHIRLPOOL cbd1506a36403706e5c543afff5f812d22897e2e7232357336d3677c3b9c0386f60c7e5c59258adba410304625df64de75b27859ebce3c8486184dde03977c30
6 8
 AUX singular_trac_439.patch 1754 SHA256 5cf46d809efd611b64691f20e7af3c888df36315ef14f7a9fb9c8bdde480e7fe SHA512 32c91ea7cdb652aaa8f2a0c0830280a87eb5f0fe2ff31ae498ba4e08bcfb062e85032defe2930df547d18637b76d104a4c5f02b3cb1101a8afc1747a0ef41926 WHIRLPOOL 8ac02919926f050c1042413debb7b965336af8c1c1b6f1e48162a5ce2724249ef9b82a29259685449572eb2b69d87ba5e8ab184af96715d181986b566d68ce81
7 9
 AUX singular_trac_440.patch 1511 SHA256 24d51c11e505ae41531c1b5342af6b0cf5a2cd69c93fc71f87ee1bd7ec04d3a9 SHA512 6358b1410409112a1c3d4d5101cc5ea7b051bd1be3760d1c327a4b8fb42ec73675de00c934d6cd985e7114b86365cc0df6abcb15f703907342e24b218143d7fb WHIRLPOOL 148370203bb54af1a1a3f988cc53859add133d3c5722b47eff816159f193bfb5e3bba2c8a4e43d26cb4daa6b1ef9bfb8c457a776345927db428b9755e6e3c191
8 10
 AUX singular_trac_441.patch 747 SHA256 1ad07bb029172da4eb35f1432541890c4054ed98f86b5bb5b7359a8759df0f1d SHA512 81557c3abb16a318646530708f1651f8ebac40f247d39ebdc1e109b8eca2bc11ca43bf12c11b6811dfb8fc152b4f8accb16fc474958aa5b71a0856673b2310ea WHIRLPOOL eb9475a046c6ea8a35fe47d33d91d4a01071bddfa7b2a7ec8d4f8ea0ca6b65f187aa924f9c72aaf04401e8737f83254e983a5139d5aa99156483383a53571da6
9 11
 AUX singular_trac_443.patch 6027 SHA256 feaa219114d1990ff633e5a980691e60e35823d61554a31d3fa4eaa56b5ca3ac SHA512 657dfdc2ad464ba1ea2fb94f2d211b3d6c78ae2dfc2da06353f5523dd62e41d892d1afb122637b65037ec0422c961105fedf0555d3eaa392098e65a04f835aaf WHIRLPOOL f1c3264876c8ab9961a830927fc782fb821884f20469fc5df267d69d78739fd07730cbb9150dfb6a06d06325caefb1017ea30bf47412bbcfdc437835515e7ec2
10 12
 DIST Singular-3-1-5.tar.gz 25200144 SHA256 37bd3e320d03b73f50c2a92384921203a1989990cbcfeff37b53414fe5e8d0f2 SHA512 55b9691307ace6d96738bcb55df83e6ada9e8df458703c6bd5074df15dd76ecbe9ca89863239cc765e5c1e84a9537e5fac1fbe8477f6deabd0658344bbcdeb3f WHIRLPOOL 6d783486df13b11478ff3d79f48a34506fad1332e6351a06e9907168b4cc0cd87a3c5629475c69bea27d608ff288e13df31483c1795d744605fb38a224698a0c
11  
-EBUILD libsingular-3.1.5.ebuild 5592 SHA256 e41c40e8fd9e1b52159d9d345df9c2bf38b86457550e1bf78e3dbf80046d4963 SHA512 02c24fa2e8ed8b623138daf57d17ce260e72694818de779ae9e3f7a5c206f3991cf3708d514b505dae63998b7cd99ac01aeb6300385c187205afb940a8288599 WHIRLPOOL 70b199fa416bdc09b76a7ee5fe5ec40fed2abd3e6906d7df9d9cd8af0a001c9c441dc3a01bf467f635c0c30f397e23d17f0ac77fa5a70d4aa6a145bf9175fa53
12  
-MISC ChangeLog 4483 SHA256 72768ace931d7c00507d62e9c3bf7d7ea53fde926df0815e1a254bb8a4e3a988 SHA512 0a8eae129e9c1e3f09c880da9fb0c88de14018b814ae75d91121bdb633b312edbeff7948b99d1a79ef113635d33276ca5671e0c5da84b14cd1db9274033e25f0 WHIRLPOOL e48f9cb9274b6adf286d986f37d3072c0657d8577b6b9c5b843a6d3b0e86f63de6da22aae88a6398d3b1d9d379a7221fb52ba45d5cbeb093146a45aed2d747c9
  13
+EBUILD libsingular-3.1.5-r1.ebuild 5705 SHA256 c73f9e608c8f682919a06f8bc3a54ad95adeb8c883b0cfc763464e2b97e3ebf1 SHA512 a4df5be4c36d60909c47fc40fd00415d100aa7a9debd990429fa0ef6e70696d2235e1747c2d7731ad4c8b0a0764c520926473f935dfe8f17d119f67667198333 WHIRLPOOL a433a96fce97c1399be3a793dd92f8d34f6dba489b16bf400dd4b5baff3ece1e849d0e378bce77ef37e512cbfc8f1f7ac30d9fa82f1ef38da906fa4b785b1492
  14
+MISC ChangeLog 4760 SHA256 975b884f51546aedd5acc0c158482be614b7fedb4891ff4dc6ee8af4f85f32e2 SHA512 534a956fb14e9c3af49fa79098643c3e9a5a45847b6641c3f5248159f814b03f33df7c8853cdc9e179ddc5a9515752802cb129df488c53659a50c880520dda16 WHIRLPOOL 80e90c3b574cba8efd8b45acea21e3398faf02d21c0690a6b212a6495da33e5502ff3ce9c7b47e6b962d8011678eea6b87fbc8377cb7dd804dabd19ac15a4359
13 15
 MISC metadata.xml 347 SHA256 00669f878b8b26046583c6d14d2cff3f582fd8541c01d802ed9818cfc4ff3083 SHA512 9b29e04257e9ee7c81e612a942f7434e24e7072ed4c1a7067b5384a6a0b6d8fef35497ca8143fb6d04a080a66f163f00d120e8f70aa44a921e84c4d197a169f6 WHIRLPOOL b4fccff146a580486590a8c31b10ba25ef68f0b47b01b17f81c13f39b22dcd47a2062c04cee5c719271d08ca9500bee2fd3d92ce09ec6bd8acdeff47dc549b81
135  sci-libs/libsingular/files/singular_15435.patch
... ...
@@ -0,0 +1,135 @@
  1
+diff --git a/kernel/ring.h b/kernel/ring.h
  2
+--- a/kernel/ring.h
  3
++++ b/kernel/ring.h
  4
+@@ -409,14 +409,14 @@
  5
+ #define rHasLocalOrMixedOrdering(R) ((R)->OrdSgn==-1)
  6
+ #define rHasLocalOrMixedOrdering_currRing() (pOrdSgn==-1)
  7
+-BOOLEAN rOrd_is_Totaldegree_Ordering(ring r =currRing);
  8
++BOOLEAN rOrd_is_Totaldegree_Ordering(const ring r =currRing);
  9
+ 
  10
+ /// return TRUE if p_SetComp requires p_Setm
  11
+-BOOLEAN rOrd_SetCompRequiresSetm(ring r);
  12
+-rOrderType_t    rGetOrderType(ring r);
  13
++BOOLEAN rOrd_SetCompRequiresSetm(const ring r);
  14
++rOrderType_t    rGetOrderType(const ring r);
  15
+ 
  16
+ /// returns TRUE if var(i) belongs to p-block
  17
+-BOOLEAN rIsPolyVar(int i, ring r = currRing);
  18
+-
  19
+-static inline BOOLEAN rOrd_is_Comp_dp(ring r)
  20
++BOOLEAN rIsPolyVar(int i, const ring r = currRing);
  21
++
  22
++static inline BOOLEAN rOrd_is_Comp_dp(const ring r)
  23
+ {
  24
+   return ((r->order[0] == ringorder_c || r->order[0] == ringorder_C) &&
  25
+diff --git a/kernel/ring.cc b/kernel/ring.cc
  26
+--- a/kernel/ring.cc
  27
++++ b/kernel/ring.cc
  28
+@@ -1899,5 +1899,5 @@
  29
+ }
  30
+ 
  31
+-rOrderType_t rGetOrderType(ring r)
  32
++rOrderType_t rGetOrderType(const ring r)
  33
+ {
  34
+   // check for simple ordering
  35
+@@ -2017,5 +2017,5 @@
  36
+ }
  37
+ 
  38
+-BOOLEAN rHasSimpleOrderAA(ring r)
  39
++BOOLEAN rHasSimpleOrderAA(const ring r)
  40
+ {
  41
+   if (r->order[0] == ringorder_unspec) return TRUE;
  42
+@@ -2048,5 +2048,5 @@
  43
+ 
  44
+ // return TRUE if p_SetComp requires p_Setm
  45
+-BOOLEAN rOrd_SetCompRequiresSetm(ring r)
  46
++BOOLEAN rOrd_SetCompRequiresSetm(const ring r)
  47
+ {
  48
+   if (r->typ != NULL)
  49
+@@ -2062,6 +2062,19 @@
  50
+ }
  51
+ 
  52
++BOOLEAN rHasModuleOrder(const ring r)
  53
++{
  54
++  int i=0;
  55
++  loop
  56
++  {
  57
++    if ((r->order[i]==ringorder_c)
  58
++    || (r->order[i]==ringorder_C))
  59
++      return TRUE;
  60
++    if (r->order[i]==0) return FALSE;
  61
++    i++;
  62
++  }
  63
++  return FALSE; /*never reached */
  64
++}
  65
+ // return TRUE if p->exp[r->pOrdIndex] holds total degree of p */
  66
+-BOOLEAN rOrd_is_Totaldegree_Ordering(ring r)
  67
++BOOLEAN rOrd_is_Totaldegree_Ordering(const ring r)
  68
+ {
  69
+   // Hmm.... what about Syz orderings?
  70
+@@ -2070,5 +2083,5 @@
  71
+            (rOrder_is_DegOrdering((rRingOrder_t)r->order[0]) ||
  72
+             rOrder_is_DegOrdering(( rRingOrder_t)r->order[1]))) ||
  73
+-           (rHasSimpleOrderAA(r) &&
  74
++           (rHasSimpleOrderAA(r) && rHasModuleOrder(r) &&
  75
+             (rOrder_is_DegOrdering((rRingOrder_t)r->order[1]) ||
  76
+              rOrder_is_DegOrdering((rRingOrder_t)r->order[2])))));
  77
+@@ -2085,5 +2098,5 @@
  78
+ }
  79
+ 
  80
+-BOOLEAN rIsPolyVar(int v, ring r)
  81
++BOOLEAN rIsPolyVar(int v, const ring r)
  82
+ {
  83
+   int  i=0;
  84
+diff --git a/kernel/gring.cc b/kernel/gring.cc
  85
+--- a/kernel/gring.cc
  86
++++ b/kernel/gring.cc
  87
+@@ -35,7 +35,4 @@
  88
+ #include <kernel/p_Mult_q.h>
  89
+ #include <kernel/pInline1.h>
  90
+-
  91
+-// dirty tricks:
  92
+-#include <kernel/p_MemAdd.h>
  93
+ 
  94
+ #include <kernel/gring.h>
  95
+@@ -461,6 +458,4 @@
  96
+ }
  97
+ 
  98
+-
  99
+-
  100
+ poly gnc_mm_Mult_nn(int *F0, int *G0, const ring r)
  101
+ /* destroys nothing, no coeffs and exps */
  102
+@@ -470,5 +465,4 @@
  103
+   int iF,jG,iG;
  104
+   int rN=r->N;
  105
+-  int ExpSize=(((rN+1)*sizeof(int)+sizeof(long)-1)/sizeof(long))*sizeof(long);
  106
+ 
  107
+   int *F=(int *)omAlloc0((rN+1)*sizeof(int));
  108
+@@ -479,5 +473,5 @@
  109
+   memcpy(G, G0,(rN+1)*sizeof(int));
  110
+   //  pExpVectorCopy(G,G0);
  111
+-  F[0]=0; /* important for p_MemAdd */
  112
++  F[0]=0;
  113
+   G[0]=0;
  114
+ 
  115
+@@ -503,8 +497,7 @@
  116
+     /* i.e. no mixed exp_num , MERGE case */
  117
+   {
  118
+-    p_MemAdd_LengthGeneral(F, G, ExpSize/sizeof(long));
  119
++    { for(int ii=rN;ii>0;ii--) F[ii]+=G[ii]; }
  120
+     p_SetExpV(out,F,r);
  121
+     p_Setm(out,r);
  122
+-    //    omFreeSize((ADDRESS)F,ExpSize);
  123
+     freeT(F,rN);
  124
+     freeT(G,rN);
  125
+@@ -565,9 +558,8 @@
  126
+       cff=totcff;
  127
+     }
  128
+-    p_MemAdd_LengthGeneral(F, G, ExpSize/sizeof(long));
  129
++    { for(int ii=rN;ii>0;ii--) F[ii]+=G[ii]; }
  130
+     p_SetExpV(out,F,r);
  131
+     p_Setm(out,r);
  132
+     p_SetCoeff(out,cff,r);
  133
+-    //    p_MemAdd_NegWeightAdjust(p, r); ??? do we need this?
  134
+     freeT(F,rN);
  135
+     freeT(G,rN);
19  sci-libs/libsingular/files/singular_part_of_changeset_baadc0f7.patch
... ...
@@ -0,0 +1,19 @@
  1
+# HG changeset patch
  2
+# User Simon King <simon.king@uni-jena.de>
  3
+# Date 1354202289 -3600
  4
+# Node ID 88cfad9e089148694276da1d8a605bf4ee015054
  5
+# Parent  ace49ff24a907b119b4aa274ab81a5abc8313825
  6
+See Sage ticket #13731, Singular ticket 463: Fix out-of-bound error in facFactorize.cc
  7
+
  8
+diff --git a/factory/facFactorize.cc b/factory/facFactorize.cc
  9
+--- a/factory/facFactorize.cc
  10
++++ b/factory/facFactorize.cc
  11
+@@ -705,7 +705,7 @@
  12
+ 
  13
+     evaluationWRTDifferentSecondVars (bufAeval2, bufEvaluation, A);
  14
+ 
  15
+-    for (int j= 0; j < A.level() - 1; j++)
  16
++    for (int j= 0; j < A.level() - 2; j++)
  17
+     {
  18
+       if (!bufAeval2[j].isEmpty())
  19
+         counter++;
2  sci-libs/libsingular/libsingular-3.1.5.ebuild → sci-libs/libsingular/libsingular-3.1.5-r1.ebuild
@@ -51,6 +51,8 @@ src_prepare () {
51 51
 	epatch "${FILESDIR}"/${PN_PATCH}_trac_440.patch
52 52
 	epatch "${FILESDIR}"/${PN_PATCH}_trac_441.patch
53 53
 	epatch "${FILESDIR}"/${PN_PATCH}_trac_443.patch
  54
+	epatch "${FILESDIR}"/${PN_PATCH}_15435.patch
  55
+	epatch "${FILESDIR}"/${PN_PATCH}_part_of_changeset_baadc0f7.patch
54 56
 	if  [[ ${CHOST} == *-darwin* ]] ; then
55 57
 		# really a placeholder until I figure out the patch for that one.
56 58
 		epatch "${FILESDIR}"/${PN_PATCH}-3.1.3.3-dylib.patch

0 notes on commit 0b82d1c

Please sign in to comment.
Something went wrong with that request. Please try again.