IPFire-SCM February 2013

ipfire-scm@lists.ipfire.org

1 participants
68 discussions

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 48d9bbba7597242bba4ded975dea0f82ba3fa462
by git＠ipfire.org 14 Feb '13

14 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 48d9bbba7597242bba4ded975dea0f82ba3fa462 (commit) via 24dbd0f7ed1fbab999baaf6dcaefb864f9c83c86 (commit) via 68053bcc1d80d0422a1933b4394d75d1d426ed03 (commit) via 6329c650dcf31863bdeb904da3c39015d19001de (commit) via 91d3495aa0bb21141b3a9670a90ce9295c45f494 (commit) via 64e760c6977710b5e18e6792f48d68dd7ae38dc8 (commit) from 3a451d8433c92444bd38b78e51bf9a4c6f07708b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 48d9bbba7597242bba4ded975dea0f82ba3fa462 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Feb 13 21:35:54 2013 +0100 qos: Remove advanced settings. commit 24dbd0f7ed1fbab999baaf6dcaefb864f9c83c86 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 13 19:01:18 2013 +0100 QoS: Make fq_codel queues smaller and remove HTB qdisc when QoS stops. http://patchwork.openwrt.org/patch/2681/ commit 68053bcc1d80d0422a1933b4394d75d1d426ed03 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 12 20:13:59 2013 +0100 curl: Update to 7.29.0. Security fix for http://curl.haxx.se/docs/adv_20130206.html. commit 6329c650dcf31863bdeb904da3c39015d19001de Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 12 19:11:35 2013 +0100 Fix typo in Dutch translation. commit 91d3495aa0bb21141b3a9670a90ce9295c45f494 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 9 21:58:14 2013 +0100 Add Dutch squid error messages. commit 64e760c6977710b5e18e6792f48d68dd7ae38dc8 Author: Hans Horsten <dutchtux(a)gmail.com> Date: Sat Feb 9 21:56:30 2013 +0100 Update of Dutch translation. ----------------------------------------------------------------------- Summary of changes: config/qos/makeqosscripts.pl | 20 ++++------- config/rootfiles/common/curl | 4 ++- config/rootfiles/common/squid | 82 +++++++++++++++++++++---------------------- html/cgi-bin/qos.cgi | 39 +++----------------- langs/nl/cgi-bin/nl.pl | 4 +-- langs/nl/install/lang_nl.c | 52 +++++++++++++-------------- lfs/curl | 4 +-- 7 files changed, 85 insertions(+), 120 deletions(-) Difference in files: diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 202bf4d..8c4f77c 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -58,6 +58,7 @@ my $subclassfile = "/var/ipfire/qos/subclasses"; my $level7file = "/var/ipfire/qos/level7config"; my $portfile = "/var/ipfire/qos/portconfig"; my $tosfile = "/var/ipfire/qos/tosconfig"; +my $fqcodel_options = "noecn limit 800 quantum 500"; &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); @@ -70,13 +71,11 @@ $qossettings{'DEF_INC_SPD'} = ''; $qossettings{'DEFCLASS_INC'} = ''; $qossettings{'DEFCLASS_OUT'} = ''; $qossettings{'ACK'} = ''; -$qossettings{'MTU'} = '1492'; $qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`; $qossettings{'IMQ_DEV'} = 'imq0'; $qossettings{'TOS'} = ''; $qossettings{'VALID'} = 'yes'; $qossettings{'IMQ_MODE'} = 'PREROUTING'; -$qossettings{'QLENGTH'} = '1000'; &General::readhash("${General::swroot}/qos/settings", \%qossettings); @@ -161,10 +160,6 @@ case "\$1" in ### INIT KERNEL modprobe sch_htb - ### SET QUEUE LENGTH & MTU - has just to be tested!!! IMPORTANT - ip link set dev $qossettings{'RED_DEV'} qlen $qossettings{'QLENGTH'} - #ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'} - ### ADD HTB QDISC FOR $qossettings{'RED_DEV'} tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1 tc qdisc add dev $qossettings{'RED_DEV'} root handle 1: htb default $qossettings{'DEFCLASS_OUT'} @@ -225,7 +220,7 @@ foreach $classentry (sort @classes) if ($qossettings{'RED_DEV'} eq $classline[0]) { $qossettings{'DEVICE'} = $classline[0]; $qossettings{'CLASS'} = $classline[1]; - print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel\n"; + print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n"; } } foreach $subclassentry (sort @subclasses) { @@ -233,7 +228,7 @@ foreach $subclassentry (sort @subclasses) { if ($qossettings{'RED_DEV'} eq $subclassline[0]) { $qossettings{'DEVICE'} = $subclassline[0]; $qossettings{'SCLASS'} = $subclassline[2]; - print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel\n"; + print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel $fqcodel_options\n"; } } print "\n\t### FILTER TRAFFIC INTO CLASSES\n"; @@ -419,10 +414,6 @@ print <<END modprobe imq numdevs=1 ip link set $qossettings{'IMQ_DEV'} up - ### SET QUEUE LENGTH & MTU - has just to be tested!!! IMPORTANT - ip link set dev $qossettings{'IMQ_DEV'} qlen $qossettings{'QLENGTH'} - # ip link set dev $qossettings{'IMQ_DEV'} mtu $qossettings{'MTU'} - ### ADD HTB QDISC FOR $qossettings{'IMQ_DEV'} tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1 tc qdisc add dev $qossettings{'IMQ_DEV'} root handle 2: htb default $qossettings{'DEFCLASS_INC'} @@ -483,7 +474,7 @@ foreach $classentry (sort @classes) if ($qossettings{'IMQ_DEV'} eq $classline[0]) { $qossettings{'DEVICE'} = $classline[0]; $qossettings{'CLASS'} = $classline[1]; - print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel\n"; + print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n"; } } foreach $subclassentry (sort @subclasses) { @@ -491,7 +482,7 @@ foreach $subclassentry (sort @subclasses) { if ($qossettings{'IMQ_DEV'} eq $subclassline[0]) { $qossettings{'DEVICE'} = $subclassline[0]; $qossettings{'SCLASS'} = $subclassline[2]; - print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel\n"; + print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel $fqcodel_options\n"; } } print "\n\t### FILTER TRAFFIC INTO CLASSES\n"; @@ -695,6 +686,7 @@ print <<END killall qosd >/dev/null 2>&1 (sleep 3 && killall -9 qosd &>/dev/null) & # DELETE QDISCS + tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1 tc qdisc add root dev $qossettings{'RED_DEV'} fq_codel >/dev/null 2>&1 tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1 tc qdisc add root dev $qossettings{'IMQ_DEV'} fq_codel >/dev/null 2>&1 diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl index 2a9e16b..c556751 100644 --- a/config/rootfiles/common/curl +++ b/config/rootfiles/common/curl @@ -16,10 +16,11 @@ usr/bin/curl usr/lib/libcurl.so usr/lib/libcurl.so.3 usr/lib/libcurl.so.4 -usr/lib/libcurl.so.4.2.0 +usr/lib/libcurl.so.4.3.0 #usr/lib/pkgconfig/libcurl.pc #usr/share/man/man1/curl-config.1 #usr/share/man/man1/curl.1 +#usr/share/man/man1/mk-ca-bundle.1 #usr/share/man/man3/curl_easy_cleanup.3 #usr/share/man/man3/curl_easy_duphandle.3 #usr/share/man/man3/curl_easy_escape.3 @@ -57,6 +58,7 @@ usr/lib/libcurl.so.4.2.0 #usr/share/man/man3/curl_multi_socket_action.3 #usr/share/man/man3/curl_multi_strerror.3 #usr/share/man/man3/curl_multi_timeout.3 +#usr/share/man/man3/curl_multi_wait.3 #usr/share/man/man3/curl_share_cleanup.3 #usr/share/man/man3/curl_share_init.3 #usr/share/man/man3/curl_share_setopt.3 diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index 1e015bf..159161a 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -1157,47 +1157,47 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/ms/error-details.txt #usr/lib/squid/errors/nl #usr/lib/squid/errors/nl-nl -#usr/lib/squid/errors/nl/ERR_ACCESS_DENIED -#usr/lib/squid/errors/nl/ERR_ACL_TIME_QUOTA_EXCEEDED -#usr/lib/squid/errors/nl/ERR_AGENT_CONFIGURE -#usr/lib/squid/errors/nl/ERR_AGENT_WPAD -#usr/lib/squid/errors/nl/ERR_CACHE_ACCESS_DENIED -#usr/lib/squid/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED -#usr/lib/squid/errors/nl/ERR_CANNOT_FORWARD -#usr/lib/squid/errors/nl/ERR_CONNECT_FAIL -#usr/lib/squid/errors/nl/ERR_DIR_LISTING -#usr/lib/squid/errors/nl/ERR_DNS_FAIL -#usr/lib/squid/errors/nl/ERR_ESI -#usr/lib/squid/errors/nl/ERR_FORWARDING_DENIED -#usr/lib/squid/errors/nl/ERR_FTP_DISABLED -#usr/lib/squid/errors/nl/ERR_FTP_FAILURE -#usr/lib/squid/errors/nl/ERR_FTP_FORBIDDEN -#usr/lib/squid/errors/nl/ERR_FTP_NOT_FOUND -#usr/lib/squid/errors/nl/ERR_FTP_PUT_CREATED -#usr/lib/squid/errors/nl/ERR_FTP_PUT_ERROR -#usr/lib/squid/errors/nl/ERR_FTP_PUT_MODIFIED -#usr/lib/squid/errors/nl/ERR_FTP_UNAVAILABLE -#usr/lib/squid/errors/nl/ERR_GATEWAY_FAILURE -#usr/lib/squid/errors/nl/ERR_ICAP_FAILURE -#usr/lib/squid/errors/nl/ERR_INVALID_REQ -#usr/lib/squid/errors/nl/ERR_INVALID_RESP -#usr/lib/squid/errors/nl/ERR_INVALID_URL -#usr/lib/squid/errors/nl/ERR_LIFETIME_EXP -#usr/lib/squid/errors/nl/ERR_NO_RELAY -#usr/lib/squid/errors/nl/ERR_ONLY_IF_CACHED_MISS -#usr/lib/squid/errors/nl/ERR_PRECONDITION_FAILED -#usr/lib/squid/errors/nl/ERR_READ_ERROR -#usr/lib/squid/errors/nl/ERR_READ_TIMEOUT -#usr/lib/squid/errors/nl/ERR_SECURE_CONNECT_FAIL -#usr/lib/squid/errors/nl/ERR_SHUTTING_DOWN -#usr/lib/squid/errors/nl/ERR_SOCKET_FAILURE -#usr/lib/squid/errors/nl/ERR_TOO_BIG -#usr/lib/squid/errors/nl/ERR_UNSUP_HTTPVERSION -#usr/lib/squid/errors/nl/ERR_UNSUP_REQ -#usr/lib/squid/errors/nl/ERR_URN_RESOLVE -#usr/lib/squid/errors/nl/ERR_WRITE_ERROR -#usr/lib/squid/errors/nl/ERR_ZERO_SIZE_OBJECT -#usr/lib/squid/errors/nl/error-details.txt +usr/lib/squid/errors/nl/ERR_ACCESS_DENIED +usr/lib/squid/errors/nl/ERR_ACL_TIME_QUOTA_EXCEEDED +usr/lib/squid/errors/nl/ERR_AGENT_CONFIGURE +usr/lib/squid/errors/nl/ERR_AGENT_WPAD +usr/lib/squid/errors/nl/ERR_CACHE_ACCESS_DENIED +usr/lib/squid/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED +usr/lib/squid/errors/nl/ERR_CANNOT_FORWARD +usr/lib/squid/errors/nl/ERR_CONNECT_FAIL +usr/lib/squid/errors/nl/ERR_DIR_LISTING +usr/lib/squid/errors/nl/ERR_DNS_FAIL +usr/lib/squid/errors/nl/ERR_ESI +usr/lib/squid/errors/nl/ERR_FORWARDING_DENIED +usr/lib/squid/errors/nl/ERR_FTP_DISABLED +usr/lib/squid/errors/nl/ERR_FTP_FAILURE +usr/lib/squid/errors/nl/ERR_FTP_FORBIDDEN +usr/lib/squid/errors/nl/ERR_FTP_NOT_FOUND +usr/lib/squid/errors/nl/ERR_FTP_PUT_CREATED +usr/lib/squid/errors/nl/ERR_FTP_PUT_ERROR +usr/lib/squid/errors/nl/ERR_FTP_PUT_MODIFIED +usr/lib/squid/errors/nl/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/nl/ERR_GATEWAY_FAILURE +usr/lib/squid/errors/nl/ERR_ICAP_FAILURE +usr/lib/squid/errors/nl/ERR_INVALID_REQ +usr/lib/squid/errors/nl/ERR_INVALID_RESP +usr/lib/squid/errors/nl/ERR_INVALID_URL +usr/lib/squid/errors/nl/ERR_LIFETIME_EXP +usr/lib/squid/errors/nl/ERR_NO_RELAY +usr/lib/squid/errors/nl/ERR_ONLY_IF_CACHED_MISS +usr/lib/squid/errors/nl/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/nl/ERR_READ_ERROR +usr/lib/squid/errors/nl/ERR_READ_TIMEOUT +usr/lib/squid/errors/nl/ERR_SECURE_CONNECT_FAIL +usr/lib/squid/errors/nl/ERR_SHUTTING_DOWN +usr/lib/squid/errors/nl/ERR_SOCKET_FAILURE +usr/lib/squid/errors/nl/ERR_TOO_BIG +usr/lib/squid/errors/nl/ERR_UNSUP_HTTPVERSION +usr/lib/squid/errors/nl/ERR_UNSUP_REQ +usr/lib/squid/errors/nl/ERR_URN_RESOLVE +usr/lib/squid/errors/nl/ERR_WRITE_ERROR +usr/lib/squid/errors/nl/ERR_ZERO_SIZE_OBJECT +usr/lib/squid/errors/nl/error-details.txt #usr/lib/squid/errors/oc #usr/lib/squid/errors/oc/ERR_ACCESS_DENIED #usr/lib/squid/errors/oc/ERR_ACL_TIME_QUOTA_EXCEEDED diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 300e6ae..31232ca 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -73,8 +73,6 @@ $qossettings{'DEF_INC_SPD'} = ''; $qossettings{'DEFCLASS_INC'} = ''; $qossettings{'DEFCLASS_OUT'} = ''; $qossettings{'ACK'} = ''; -$qossettings{'MTU'} = '1492'; -$qossettings{'QLENGTH'} = '1000'; $qossettings{'RED_DEV'} = 'ppp0'; $qossettings{'IMQ_DEV'} = 'imq0'; $qossettings{'VALID'} = 'yes'; @@ -659,13 +657,6 @@ END &Header::closepage(); exit } -elsif ($qossettings{'ACTION'} eq "$Lang::tr{'urlfilter advanced settings'}" ) -{ - &expert(); - &Header::closebigbox(); - &Header::closepage(); - exit -} if ($qossettings{'ACTIONBW'} eq "$Lang::tr{'modify'}" ) { &changebandwidth(); @@ -749,11 +740,11 @@ END </table> </form> <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <table border='0' cellpadding='0' cellspacing='0'> - <tr><td><input type='submit' name='ACTION' value='$Lang::tr{'parentclass add'}' /> - <td><input type='submit' name='ACTION' value='$Lang::tr{'urlfilter advanced settings'}' /> - <td><input type='submit' name='ACTION' value='$Lang::tr{'status'}' /> - </tr></table> + <table width='66%' border='0'> + <tr><td width='100%' align='center'> + <input type='submit' name='ACTION' value='$Lang::tr{'parentclass add'}' /> + <input type='submit' name='ACTION' value='$Lang::tr{'status'}' /> + </td></tr></table> </form> END ; @@ -1435,26 +1426,6 @@ END } } } - -sub expert -{ - &Header::openbox('100%', 'center', $Lang::tr{'expertoptions'}); - print <<END - <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <table width='66%'> - <tr><td width='33%' align='right'>MTU:<td width='33%' align='left'> - <input type='text' name='MTU' maxlength='8' required='4' value='$qossettings{'MTU'}' /> - <td width='33%' align='center'>$Lang::tr{'mtu QoS'} - <tr><td width='33%' align='right'>$Lang::tr{'Queuelenght'}:<td width='33%' align='left'> - <input type='text' name='QLENGTH' maxlength='8' required='2' value='$qossettings{'QLENGTH'}' /> - <td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /> - </table> - </form> -END -; - &Header::closebox(); -} - sub validminbwdth { if ( $qossettings{'VALID'} eq 'yes' ) { if ( $qossettings{'DEVICE'} eq $qossettings{'RED_DEV'} ) { diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index d8f9eee..462cdfa 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -870,8 +870,8 @@ 'fireinfo please enable' => 'Schakel a.u.b. de fireinfo service in.', 'fireinfo settings' => 'Fireinfo instellingen', 'fireinfo system version' => 'Systeemversies', -'fireinfo why descr1' => 'Het is zeer belangrijk voor ontwikkelaars van IPFire dat u dit inschakelt', -'fireinfo why descr2' => 'service. ', +'fireinfo why descr1' => 'Het is zeer belangrijk voor ontwikkelaars van IPFire dat u deze service inschakelt', +'fireinfo why descr2' => '.', 'fireinfo why enable' => 'Waarom moet ik fireinfo inschakelen?', 'fireinfo why read more' => 'Lees meer over de redenen.', 'fireinfo your profile id' => 'Uw profiel ID', diff --git a/langs/nl/install/lang_nl.c b/langs/nl/install/lang_nl.c index 40b64d2..b9a8ec4 100644 --- a/langs/nl/install/lang_nl.c +++ b/langs/nl/install/lang_nl.c @@ -32,9 +32,9 @@ char *nl_tr[] = { /* TR_ISDN */ "ISDN", /* TR_ERROR_PROBING_ISDN */ -"Niet in staat om te scannen op ISDN-apparaten.", +"Kan ISDN-apparaten niet detecteren.", /* TR_PROBING_ISDN */ -"Scannen en configureren van ISDN-apparaten.", +"Detecteren en configureren van ISDN-apparaten.", /* TR_MISSING_GREEN_IP */ "Groen IP-adres ontbreekt!", /* TR_CHOOSE_FILESYSTEM */ @@ -74,7 +74,7 @@ char *nl_tr[] = { /* TR_ALL_CARDS_SUCCESSFULLY_ALLOCATED */ "Alle kaarten zijn succesvol toegewezen.", /* TR_AUTODETECT */ -"* AUTODETECT *", +"* AUTOMATISCH DETECTEREN *", /* TR_BUILDING_INITRD */ "Aanmaken ramdisk...", /* TR_CANCEL */ @@ -86,7 +86,7 @@ char *nl_tr[] = { /* TR_CHECKING_FOR */ "Controleert voor: %s", /* TR_CHOOSE_THE_ISDN_CARD_INSTALLED */ -"Kies de ISDN-kaart die geïnstalleerd is op deze computer.", +"Kies de ISDN-kaart die geÃ¯nstalleerd is op deze computer.", /* TR_CHOOSE_THE_ISDN_PROTOCOL */ "Kies het ISDN-protocol dat u nodig heeft.", /* TR_CONFIGURE_DHCP */ @@ -96,13 +96,13 @@ char *nl_tr[] = { /* TR_CONFIGURE_NETWORKING_LONG */ "U moet nu het netwerk configureren door eerst de juiste driver te laden voor de GROENE interface. U kunt dit doen door ofwel automatisch te zoeken naar een netwerkkaart, of door de juiste driver te kiezen uit een lijst. Als u meer dan een kaart in uw machine heeft, dan kunt u die later in het installatieproces configureren. Mocht u meer dan een kaart van hetzelfde type als GROEN gebruiken en iedere kaart vereist speciale moduleparameters, dan moet u de parameters voor alle kaarten van dit type invoeren zodat alle kaarten actief kunnen worden waneer u de GROENE interface configureert.", /* TR_CONFIGURE_NETWORK_DRIVERS */ -"Configureer netwerkdrivers, en bepaal welke interface iedere kaart krijgt toegewezen. De huidige configuratie is als volgt:\n\n", +"Configureer netwerkdrivers en bepaal welke interface iedere kaart krijgt toegewezen.\nDe huidige configuratie is als volgt:\n\n", /* TR_CONFIGURE_THE_CDROM */ "Configureer de CDROM door het juiste IO-adres en/of IRQ te kiezen.", /* TR_CONGRATULATIONS */ "Gefeliciteerd!", /* TR_CONGRATULATIONS_LONG */ -"%s is succesvol geïnstalleerd. Verwijder a.u.b. de CDROM's in uw computer. U kunt nu de netwerkkaarten en ISDN configureren en de systeemwachtwoorden instellen. Nadat de setup is afgerond, kunt u met de webbrowser naar https://%s:444 (of hoe u %s ook genoemd heeft) en het inbelnetwerk configureren (als nodig) en de remote toegang.", +"%s is succesvol geÃ¯nstalleerd. Verwijder a.u.b. de CDROM's in uw computer. U kunt nu de netwerkkaarten en ISDN configureren en de systeemwachtwoorden instellen. Nadat de setup is afgerond, kunt u met de webbrowser naar https://%s:444 (of hoe u %s ook genoemd heeft) en het inbelnetwerk configureren (als nodig) en de remote toegang.", /* TR_CONTINUE_NO_SWAP */ "Uw vaste schijf is erg klein, maar u kunt verder gaan met een zeer kleine swap. (Wees hier voorzichtig mee).", /* TR_CURRENT_CONFIG */ @@ -132,7 +132,7 @@ char *nl_tr[] = { /* TR_DNS_AND_GATEWAY_SETTINGS */ "DNS en Gateway instellingen", /* TR_DNS_AND_GATEWAY_SETTINGS_LONG */ -"Voer de DNS en gateway informatie in. Deze instellingen worden alleen gebruikt met statische IP-adressen (en DHCP als DNS is ingesteld) op de RODE interface.", +"Voer de DNS en gateway informatie in. Deze instellingen worden alleen gebruikt met statische IP-adressen (en DHCP als DNS is ingesteld) op de RODE interface.", /* TR_DNS_GATEWAY_WITH_GREEN */ "Uw configuratie gebruikt geen ethernetadapter voor z'n RODE interface. DNS en gateway voor inbelgebruikers worden automatisch geconfigureerd tijdens inbellen.", /* TR_DOMAINNAME */ @@ -164,25 +164,25 @@ char *nl_tr[] = { /* TR_ENTER_ADDITIONAL_MODULE_PARAMS */ "Bepaalde ISDN-kaarten (met name de ISA-kaarten) kunnen extra moduleparameters vereisen voor het instellen van IRQ- en IO-adressen. Als u zo'n ISDN-kaart heeft, voer deze parameters dan hier in. Bijvoorbeeld: \"io=0x280 irq=9\". Deze gegevens worden gebruikt tijdens de kaartdetectie.", /* TR_ENTER_ADMIN_PASSWORD */ -"Voer het %s 'admin' wachtwoord in. Dit is de gebruikersnaam die gebruikt wordt om in te loggen op de %s webbeheerpagina's.", +"Voer het %s 'admin' wachtwoord in. Dit is de gebruikersnaam die gebruikt wordt om in te loggen op de %s webbeheerpagina's.", /* TR_ENTER_DOMAINNAME */ -"Invoeren domeinnaam", +"Voer de domeinnaam in", /* TR_ENTER_HOSTNAME */ -"Invoeren machinehostnaam.", +"Voer de machinehostnaam in", /* TR_ENTER_IP_ADDRESS_INFO */ -"Invoeren IP-adres informatie", +"Voer de IP-adres informatie in", /* TR_ENTER_NETWORK_DRIVER */ "Automatisch detecteren van netwerkkaart is mislukt. Voer de drivernaam en optionele parameters in voor de netwerkkaart.", /* TR_ENTER_ROOT_PASSWORD */ -"Invoeren van het 'root' wachtwoord. Log in als deze gebruiker voor commandoregel toegang.", +"Voer het 'root' wachtwoord in. Log in als deze gebruiker voor commandoregel toegang.", /* TR_ENTER_SETUP_PASSWORD */ "WORDT VERWIJDERD", /* TR_ENTER_THE_IP_ADDRESS_INFORMATION */ -"Invoeren van IP-adres informatie voor de %s interface.", +"Voer de IP-adres informatie in voor de %s interface.", /* TR_ENTER_THE_LOCAL_MSN */ -"Invoeren van lokaal telefoonnummer (MSN/EAZ).", +"Voer lokaal telefoonnummer in (MSN/EAZ).", /* TR_ENTER_URL */ -"Invoeren van URL-pad naar de ipcop-<versie>.tgz en images/scsidrv-<versie>.img bestanden. WAARSCHUWING: DNS is niet beschikbaar! Dit zou http://X.X.X.X/<directory> moeten zijn", +"Voer het URL-pad in naar de ipcop-<versie>.tgz en images/scsidrv-<versie>.img bestanden. WAARSCHUWING: DNS is niet beschikbaar! Dit zou http://X.X.X.X/<directory> moeten zijn", /* TR_ERROR */ "Fout", /* TR_ERROR_PROBING_CDROM */ @@ -200,7 +200,7 @@ char *nl_tr[] = { /* TR_GERMAN_1TR6 */ "German 1TR6", /* TR_HELPLINE */ -" <Tab>/<Alt-Tab> schakelen tussen elementen | <Spatie> selecteert", +" <Tab>/<Alt-Tab> schakel tussen elementen | <Spatie> selecteer", /* TR_HOSTNAME */ "Hostnaam", /* TR_HOSTNAME_CANNOT_BE_EMPTY */ @@ -290,7 +290,7 @@ char *nl_tr[] = { /* TR_MODULE_NAME_CANNOT_BE_BLANK */ "Modulenaam mag niet leeg zijn.", /* TR_MODULE_PARAMETERS */ -"Invoeren van de modulenaam en parameters voor de driver die u nodig hebt.", +"Voer de modulenaam en parameters in voor de driver die u nodig hebt.", /* TR_MOUNTING_BOOT_FILESYSTEM */ "Koppelen van het boot bestandssysteem...", /* TR_MOUNTING_LOG_FILESYSTEM */ @@ -354,9 +354,9 @@ char *nl_tr[] = { /* TR_PHONENUMBER_CANNOT_BE_EMPTY */ "Telefoonnummer mag niet leeg zijn.", /* TR_PREPARE_HARDDISK */ -"Het installatieprogramma zal nu de vaste schijf voorbereiden op %s. Eerst wordt de schijf gepartitioneerd, daarna zullen de bestandssystemen erop worden gezet.", +"Het installatieprogramma zal nu de vaste schijf voorbereiden op %s. Eerst wordt de schijf gepartitioneerd, daarna zullen de bestandssystemen erop worden gezet.\n\nALLE DATA OP DE SCHIJF ZAL WORDEN GEWIST. Wilt u hiermee doorgaan?", /* TR_PRESS_OK_TO_REBOOT */ -"Klik Ok om te herstarten.", +"Druk Ok om te herstarten.", /* TR_PRIMARY_DNS */ "Primaire DNS:", /* TR_PRIMARY_DNS_CR */ @@ -386,13 +386,13 @@ char *nl_tr[] = { /* TR_QUIT */ "Stoppen", /* TR_RED_IN_USE */ -"ISDN (of een andere externe verbinding) is momenteel in gebruik. U kunt ISDN niet configureren zolang de RODE interface actief is.", +"ISDN (of een andere externe verbinding) is momenteel in gebruik. U kunt ISDN niet configureren zolang de RODE interface actief is.", /* TR_RESTART_REQUIRED */ "\n\nAls de configuratie gereed is moet het netwerk herstart worden.", /* TR_RESTORE */ "Terugzetten", /* TR_RESTORE_CONFIGURATION */ -"Als u een diskette heeft met een %s systeemconfiguratie daarop, plaats dan de diskette in het station en klik op de terugzetten-knop.", +"Als u een diskette heeft met een %s systeemconfiguratie daarop, plaats dan de diskette in het station en druk op de terugzetten-knop.", /* TR_ROOT_PASSWORD */ "'root' wachtwoord", /* TR_SECONDARY_DNS */ @@ -408,11 +408,11 @@ char *nl_tr[] = { /* TR_SELECT_CDROM_TYPE */ "Selecteer CDROM type", /* TR_SELECT_CDROM_TYPE_LONG */ -"Er is geen CD-ROM gedetecteerd in deze machine. Maak een keuze uit de volgende drivers waarmee %s de CD-ROM kan benaderen.", +"Er is geen CD-ROM gedetecteerd in deze machine. Maak een keuze uit de volgende drivers waarmee %s de CD-ROM kan benaderen.", /* TR_SELECT_INSTALLATION_MEDIA */ "Selecteer installatiemedium", /* TR_SELECT_INSTALLATION_MEDIA_LONG */ -"%s kan worden geïnstalleerd vanuit verschillende bronnen. De eenvoudigste manier is om de CDROM-speler van de machine te gebruiken. Als de computer geen CDROM-speler heeft, dan kunt vanaf een andere machine installeren die de installatiebestanden beschikbaar kan maken over het netwerk via HTTP of FTP.", +"%s kan worden geÃ¯nstalleerd vanuit verschillende bronnen. De eenvoudigste manier is om de CDROM-speler van de machine te gebruiken. Als de computer geen CDROM-speler heeft, dan kunt vanaf een andere machine installeren die de installatiebestanden beschikbaar kan maken over het netwerk via HTTP of FTP.", /* TR_SELECT_NETWORK_DRIVER */ "Selecteer netwerkdriver", /* TR_SELECT_NETWORK_DRIVER_LONG */ @@ -428,9 +428,9 @@ char *nl_tr[] = { /* TR_SETTING_SETUP_PASSWORD */ "WORDT VERWIJDERD", /* TR_SETUP_FINISHED */ -"Setup is afgerond. Klik Ok.", +"Setup is afgerond. Druk Ok.", /* TR_SETUP_NOT_COMPLETE */ -"Initiële setup was niet volledig afgerond. Verzeker u ervan dat de setup goed is afgerond door het setup programma nogmaals vanaf de commandoregel te draaien.", +"InitiÃ«le setup was niet volledig afgerond. Verzeker u ervan dat de setup goed is afgerond door het setup programma nogmaals vanaf de commandoregel te starten.", /* TR_SETUP_PASSWORD */ "WORDT VERWIJDERD", /* TR_SET_ADDITIONAL_MODULE_PARAMETERS */ @@ -548,7 +548,7 @@ char *nl_tr[] = { /* TR_WARNING_LONG */ "Als u dit IP-adres wijzigt, en u bent op afstand ingelogd, dan zal de verbinding naar de %s machine worden verbroken en u zult opnieuw moeten verbinden naar het nieuwe IP-adres. Dit is een riskante handeling en moet alleen geprobeerd worden als u fysieke toegang tot de machine hebt, in het geval er iets fout gaat.", /* TR_WELCOME */ -"Welkom bij het %s installatieprogramma. Als u 'annuleren' op een van de volgende schermen selecteert zal de computer herstarten.", +"Welkom bij het %s installatieprogramma. Als u 'annuleren' kiest op een van de volgende schermen selecteert zal de computer herstarten.", /* TR_YOUR_CONFIGURATION_IS_SINGLE_GREEN_ALREADY_HAS_DRIVER */ "Uw configuratie is ingesteld voor een enkele GROENE interface, welke al een driver toegewezen heeft.", /* TR_YES */ diff --git a/lfs/curl b/lfs/curl index 5b6e3b8..1228f39 100644 --- a/lfs/curl +++ b/lfs/curl @@ -24,7 +24,7 @@ include Config -VER = 7.24.0 +VER = 7.29.0 THISAPP = curl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b93420f80a2baaa61a0f45214eddc2ba +$(DL_FILE)_MD5 = 4f57d3b4a3963038bd5e04dbff385390 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 48d9bbba7597242bba4ded975dea0f82ba3fa462
by git＠ipfire.org 13 Feb '13

13 Feb '13

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 24dbd0f7ed1fbab999baaf6dcaefb864f9c83c86
by git＠ipfire.org 13 Feb '13

13 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 24dbd0f7ed1fbab999baaf6dcaefb864f9c83c86 (commit) from 68053bcc1d80d0422a1933b4394d75d1d426ed03 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 24dbd0f7ed1fbab999baaf6dcaefb864f9c83c86 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 13 19:01:18 2013 +0100 QoS: Make fq_codel queues smaller and remove HTB qdisc when QoS stops. http://patchwork.openwrt.org/patch/2681/ ----------------------------------------------------------------------- Summary of changes: config/qos/makeqosscripts.pl | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) Difference in files: diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 202bf4d..8c4f77c 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -58,6 +58,7 @@ my $subclassfile = "/var/ipfire/qos/subclasses"; my $level7file = "/var/ipfire/qos/level7config"; my $portfile = "/var/ipfire/qos/portconfig"; my $tosfile = "/var/ipfire/qos/tosconfig"; +my $fqcodel_options = "noecn limit 800 quantum 500"; &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); @@ -70,13 +71,11 @@ $qossettings{'DEF_INC_SPD'} = ''; $qossettings{'DEFCLASS_INC'} = ''; $qossettings{'DEFCLASS_OUT'} = ''; $qossettings{'ACK'} = ''; -$qossettings{'MTU'} = '1492'; $qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`; $qossettings{'IMQ_DEV'} = 'imq0'; $qossettings{'TOS'} = ''; $qossettings{'VALID'} = 'yes'; $qossettings{'IMQ_MODE'} = 'PREROUTING'; -$qossettings{'QLENGTH'} = '1000'; &General::readhash("${General::swroot}/qos/settings", \%qossettings); @@ -161,10 +160,6 @@ case "\$1" in ### INIT KERNEL modprobe sch_htb - ### SET QUEUE LENGTH & MTU - has just to be tested!!! IMPORTANT - ip link set dev $qossettings{'RED_DEV'} qlen $qossettings{'QLENGTH'} - #ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'} - ### ADD HTB QDISC FOR $qossettings{'RED_DEV'} tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1 tc qdisc add dev $qossettings{'RED_DEV'} root handle 1: htb default $qossettings{'DEFCLASS_OUT'} @@ -225,7 +220,7 @@ foreach $classentry (sort @classes) if ($qossettings{'RED_DEV'} eq $classline[0]) { $qossettings{'DEVICE'} = $classline[0]; $qossettings{'CLASS'} = $classline[1]; - print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel\n"; + print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n"; } } foreach $subclassentry (sort @subclasses) { @@ -233,7 +228,7 @@ foreach $subclassentry (sort @subclasses) { if ($qossettings{'RED_DEV'} eq $subclassline[0]) { $qossettings{'DEVICE'} = $subclassline[0]; $qossettings{'SCLASS'} = $subclassline[2]; - print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel\n"; + print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel $fqcodel_options\n"; } } print "\n\t### FILTER TRAFFIC INTO CLASSES\n"; @@ -419,10 +414,6 @@ print <<END modprobe imq numdevs=1 ip link set $qossettings{'IMQ_DEV'} up - ### SET QUEUE LENGTH & MTU - has just to be tested!!! IMPORTANT - ip link set dev $qossettings{'IMQ_DEV'} qlen $qossettings{'QLENGTH'} - # ip link set dev $qossettings{'IMQ_DEV'} mtu $qossettings{'MTU'} - ### ADD HTB QDISC FOR $qossettings{'IMQ_DEV'} tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1 tc qdisc add dev $qossettings{'IMQ_DEV'} root handle 2: htb default $qossettings{'DEFCLASS_INC'} @@ -483,7 +474,7 @@ foreach $classentry (sort @classes) if ($qossettings{'IMQ_DEV'} eq $classline[0]) { $qossettings{'DEVICE'} = $classline[0]; $qossettings{'CLASS'} = $classline[1]; - print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel\n"; + print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n"; } } foreach $subclassentry (sort @subclasses) { @@ -491,7 +482,7 @@ foreach $subclassentry (sort @subclasses) { if ($qossettings{'IMQ_DEV'} eq $subclassline[0]) { $qossettings{'DEVICE'} = $subclassline[0]; $qossettings{'SCLASS'} = $subclassline[2]; - print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel\n"; + print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel $fqcodel_options\n"; } } print "\n\t### FILTER TRAFFIC INTO CLASSES\n"; @@ -695,6 +686,7 @@ print <<END killall qosd >/dev/null 2>&1 (sleep 3 && killall -9 qosd &>/dev/null) & # DELETE QDISCS + tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1 tc qdisc add root dev $qossettings{'RED_DEV'} fq_codel >/dev/null 2>&1 tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1 tc qdisc add root dev $qossettings{'IMQ_DEV'} fq_codel >/dev/null 2>&1 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 32dd65d0dce5328f91cc87ec3620151af91b4061
by git＠ipfire.org 13 Feb '13

13 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 32dd65d0dce5328f91cc87ec3620151af91b4061 (commit) via fdc6f71fcf017e43ffae2ce581060eaf47190035 (commit) via 2a0d0c295507a78c50d5757cdd22dd8c6cf791af (commit) via 348705648d1a346abcdf7ee805d099ad41dc29e8 (commit) via ac09410072acde7194125e021d7e7a23dd1480a5 (commit) via 8cfd997ff1251b6429896eae4d956a7430cff544 (commit) via 24c66e44e7568e887f61b4f2473507eb7b943ec1 (commit) via c712511efea0180c60b7b1735e17d34cddfe2cdd (commit) from bb10029704219063a42ef4119bf72e11a127c401 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 32dd65d0dce5328f91cc87ec3620151af91b4061 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 12 22:08:29 2013 +0100 curl: Update to 7.29.0. Major update to latest version. Fixes CVE-2013-0249. commit fdc6f71fcf017e43ffae2ce581060eaf47190035 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 12 21:44:10 2013 +0100 pango: Update to 1.32.5. Update to the latest stable version. Enable introspection support. commit 2a0d0c295507a78c50d5757cdd22dd8c6cf791af Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 12 21:22:27 2013 +0100 harfbuzz: Update to 0.9.12. This is an update to the latest stable version of harfbuzz. Activate support for icu. commit 348705648d1a346abcdf7ee805d099ad41dc29e8 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 12 21:20:28 2013 +0100 icu: New package. This is a build dependency of harfbuzz with icu support and webkitgtk3. commit ac09410072acde7194125e021d7e7a23dd1480a5 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 3 20:10:18 2013 +0100 gobject-intospection: Update to 1.35.4. Update to the latest version. commit 8cfd997ff1251b6429896eae4d956a7430cff544 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 3 20:09:32 2013 +0100 glib2: Update to 2.35.4. Update to the latest stable version. commit 24c66e44e7568e887f61b4f2473507eb7b943ec1 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 3 20:08:50 2013 +0100 gdk-pixbuf2: Update to 2.27.1. Major update to latest stable. commit c712511efea0180c60b7b1735e17d34cddfe2cdd Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 3 20:07:17 2013 +0100 cairo: Update to 1.12.12. This is a major update to the latest stable version. * Enable introspection support. * Ship introspection with own packages. ----------------------------------------------------------------------- Summary of changes: cairo/cairo.nm | 41 +++++++++++- curl/curl.nm | 4 +- curl/patches/0101-curl-7.21.1-multilib.patch | 64 ------------------- curl/patches/0101-curl-7.29.0-multilib.patch | 72 ++++++++++++++++++++++ ....2-debug.patch => 0102-curl-7.29.0-debug.patch} | 33 ++++++---- gdk-pixbuf2/gdk-pixbuf2.nm | 7 ++- glib2/glib2.nm | 2 +- gobject-introspection/gobject-introspection.nm | 16 +++-- harfbuzz/harfbuzz.nm | 6 +- icu/icu.nm | 68 ++++++++++++++++++++ pango/pango.nm | 19 +++--- 11 files changed, 231 insertions(+), 101 deletions(-) delete mode 100644 curl/patches/0101-curl-7.21.1-multilib.patch create mode 100644 curl/patches/0101-curl-7.29.0-multilib.patch rename curl/patches/{curl-7.21.2-debug.patch => 0102-curl-7.29.0-debug.patch} (72%) create mode 100644 icu/icu.nm Difference in files: diff --git a/cairo/cairo.nm b/cairo/cairo.nm index 5b05833..55b92f8 100644 --- a/cairo/cairo.nm +++ b/cairo/cairo.nm @@ -4,7 +4,7 @@ ############################################################################### name = cairo -version = 1.12.4 +version = 1.12.12 release = 1 groups = System/Graphics @@ -25,6 +25,7 @@ build binutils>=2.21.51.0.8-2 fontconfig-devel freetype-devel + gobject-introspection-devel libX11-devel libXext-devel>=1.3.1 libxml2-devel @@ -37,12 +38,30 @@ build configure_options += \ --enable-xlib \ --enable-xml \ + --enable-gobject \ + --disable-gtk-doc \ --disable-static end packages package %{name} + package %{name}-gobject + summary = GObject bindings for cairo. + description + This package contains functionality to make cairo + graphics library integrate well with the GObject object system. + end + + requires + cairo = %{thisver} + end + + files + %{libdir}/*gobject.so.* + end + end + package %{name}-devel template DEVEL @@ -55,6 +74,26 @@ packages end end + package %{name}-gobject-devel + summary = Development files for cairo-gobject. + description + This package contains libraries, header files and developer + documentation needed for developing software which uses the + cairo Gobject library. + end + + requires + %{name}-gobject = %{thisver} + %{name}-devel = %{thisver} + end + + files + %{libdir}/*gobject.so + %{libdir}/pkgconfig/*gobject.pc + %{includedir}/cairo/*gobject.h + end + end + package %{name}-debuginfo template DEBUGINFO end diff --git a/curl/curl.nm b/curl/curl.nm index 4581431..6cfa7b5 100644 --- a/curl/curl.nm +++ b/curl/curl.nm @@ -4,8 +4,8 @@ ############################################################################### name = curl -version = 7.24.0 -release = 4 +version = 7.29.0 +release = 1 groups = Application/Internet url = http://www.curl.haxx.se/ diff --git a/curl/patches/0101-curl-7.21.1-multilib.patch b/curl/patches/0101-curl-7.21.1-multilib.patch deleted file mode 100644 index 83c1cd8..0000000 --- a/curl/patches/0101-curl-7.21.1-multilib.patch +++ /dev/null @@ -1,64 +0,0 @@ - curl-config.in | 22 ++++------------------ - libcurl.pc.in | 1 + - 2 files changed, 5 insertions(+), 18 deletions(-) - -diff --git a/curl-config.in b/curl-config.in -index ebda129..b404827 100644 ---- a/curl-config.in -+++ b/curl-config.in -@@ -43,7 +43,6 @@ Available values for OPTION include: - --libs library linking information - --prefix curl install prefix - --protocols newline separated list of enabled protocols -- --static-libs static libcurl library linking information - --version output version information - --vernum output the version information as a number (hexadecimal) - EOF -@@ -74,7 +73,7 @@ while test $# -gt 0; do - ;; - - --cc) -- echo "@CC@" -+ echo "gcc" - ;; - - --prefix) -@@ -136,25 +135,12 @@ while test $# -gt 0; do - ;; - - --libs) -- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then -- CURLLIBDIR="-L@libdir@ " -- else -- CURLLIBDIR="" -- fi -- if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then -- echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ -- else -- echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@ -- fi -- ;; -- -- --static-libs) -- echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ -+ pkg-config libcurl --libs - ;; - - --configure) -- echo @CONFIGURE_OPTIONS@ -- ;; -+ pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//' -+ ;; - - *) - echo "unknown option: $1" ---- a/libcurl.pc.in -+++ b/libcurl.pc.in -@@ -29,6 +29,7 @@ libdir=@libdir@ - includedir=@includedir@ - supported_protocols="@SUPPORT_PROTOCOLS@" - supported_features="@SUPPORT_FEATURES@" -+configure_options=@CONFIGURE_OPTIONS@ - - Name: libcurl - URL: http://curl.haxx.se/ diff --git a/curl/patches/0101-curl-7.29.0-multilib.patch b/curl/patches/0101-curl-7.29.0-multilib.patch new file mode 100644 index 0000000..38aa86c --- /dev/null +++ b/curl/patches/0101-curl-7.29.0-multilib.patch @@ -0,0 +1,72 @@ + curl-config.in | 16 +++------------- + docs/curl-config.1 | 4 +++- + libcurl.pc.in | 1 + + 3 files changed, 7 insertions(+), 14 deletions(-) + +diff --git a/curl-config.in b/curl-config.in +index 150004d..95d0759 100644 +--- a/curl-config.in ++++ b/curl-config.in +@@ -75,7 +75,7 @@ while test $# -gt 0; do + ;; + + --cc) +- echo "@CC@" ++ echo "gcc" + ;; + + --prefix) +@@ -142,24 +142,14 @@ while test $# -gt 0; do + ;; + + --libs) +- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then +- CURLLIBDIR="-L@libdir@ " +- else +- CURLLIBDIR="" +- fi +- if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then +- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ +- else +- echo ${CURLLIBDIR}-lcurl +- fi ++ pkg-config libcurl --libs + ;; + + --static-libs) +- echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ + ;; + + --configure) +- echo @CONFIGURE_OPTIONS@ ++ pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//' + ;; + + *) +diff --git a/docs/curl-config.1 b/docs/curl-config.1 +index c4f4e2b..3e0ea60 100644 +--- a/docs/curl-config.1 ++++ b/docs/curl-config.1 +@@ -65,7 +65,9 @@ be listed using uppercase and are separa + one, or several protocols in the list. (Added in 7.13.0) + .IP "--static-libs" + Shows the complete set of libs and other linker options you will need in order +-to link your application with libcurl statically. (Added in 7.17.1) ++to link your application with libcurl statically. Note that Fedora/RHEL libcurl ++packages do not provide any static libraries, thus cannot be linked statically. ++(Added in 7.17.1) + .IP "--version" + Outputs version information about the installed libcurl. + .IP "--vernum" +diff --git a/libcurl.pc.in b/libcurl.pc.in +index 2ba9c39..f8f8b00 100644 +--- a/libcurl.pc.in ++++ b/libcurl.pc.in +@@ -29,6 +29,7 @@ libdir=@libdir@ + includedir=@includedir@ + supported_protocols="@SUPPORT_PROTOCOLS@" + supported_features="@SUPPORT_FEATURES@" ++configure_options=@CONFIGURE_OPTIONS@ + + Name: libcurl + URL: http://curl.haxx.se/ diff --git a/curl/patches/0102-curl-7.29.0-debug.patch b/curl/patches/0102-curl-7.29.0-debug.patch new file mode 100644 index 0000000..7f70530 --- /dev/null +++ b/curl/patches/0102-curl-7.29.0-debug.patch @@ -0,0 +1,65 @@ +From 6710648c2b270c9ce68a7d9f1bba1222c7be8b58 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka <kdudka(a)redhat.com> +Date: Wed, 31 Oct 2012 11:38:30 +0100 +Subject: [PATCH] prevent configure script from discarding -g in CFLAGS (#496778) + +--- + configure | 13 +++---------- + m4/curl-compilers.m4 | 13 +++---------- + 2 files changed, 6 insertions(+), 20 deletions(-) + +diff --git a/configure b/configure +index 8f079a3..53b4774 100755 +--- a/configure ++++ b/configure +@@ -15759,18 +15759,11 @@ $as_echo "yes" >&6; } + gccvhi=`echo $gccver | cut -d . -f1` + gccvlo=`echo $gccver | cut -d . -f2` + compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` +- flags_dbg_all="-g -g0 -g1 -g2 -g3" +- flags_dbg_all="$flags_dbg_all -ggdb" +- flags_dbg_all="$flags_dbg_all -gstabs" +- flags_dbg_all="$flags_dbg_all -gstabs+" +- flags_dbg_all="$flags_dbg_all -gcoff" +- flags_dbg_all="$flags_dbg_all -gxcoff" +- flags_dbg_all="$flags_dbg_all -gdwarf-2" +- flags_dbg_all="$flags_dbg_all -gvms" ++ flags_dbg_all="" + flags_dbg_yes="-g" + flags_dbg_off="" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" +- flags_opt_yes="-O2" ++ flags_opt_all="" ++ flags_opt_yes="" + flags_opt_off="-O0" + + if test -z "$SED"; then +diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 +index 0cbba7a..9175b5b 100644 +--- a/m4/curl-compilers.m4 ++++ b/m4/curl-compilers.m4 +@@ -148,18 +148,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [ + gccvhi=`echo $gccver | cut -d . -f1` + gccvlo=`echo $gccver | cut -d . -f2` + compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` +- flags_dbg_all="-g -g0 -g1 -g2 -g3" +- flags_dbg_all="$flags_dbg_all -ggdb" +- flags_dbg_all="$flags_dbg_all -gstabs" +- flags_dbg_all="$flags_dbg_all -gstabs+" +- flags_dbg_all="$flags_dbg_all -gcoff" +- flags_dbg_all="$flags_dbg_all -gxcoff" +- flags_dbg_all="$flags_dbg_all -gdwarf-2" +- flags_dbg_all="$flags_dbg_all -gvms" ++ flags_dbg_all="" + flags_dbg_yes="-g" + flags_dbg_off="" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" +- flags_opt_yes="-O2" ++ flags_opt_all="" ++ flags_opt_yes="" + flags_opt_off="-O0" + CURL_CHECK_DEF([_WIN32], [], [silent]) + else +-- +1.7.1 + diff --git a/curl/patches/curl-7.21.2-debug.patch b/curl/patches/curl-7.21.2-debug.patch deleted file mode 100644 index 7691826..0000000 --- a/curl/patches/curl-7.21.2-debug.patch +++ /dev/null @@ -1,58 +0,0 @@ - configure | 15 ++++----------- - m4/curl-compilers.m4 | 15 ++++----------- - 2 files changed, 8 insertions(+), 22 deletions(-) - -diff --git a/configure b/configure -index d3ecf69..6d8f085 100755 ---- a/configure -+++ b/configure -@@ -15040,18 +15040,11 @@ $as_echo "yes" >&6; } - gccvhi=`echo $gccver | cut -d . -f1` - gccvlo=`echo $gccver | cut -d . -f2` - compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` -- flags_dbg_all="-g -g0 -g1 -g2 -g3" -- flags_dbg_all="$flags_dbg_all -ggdb" -- flags_dbg_all="$flags_dbg_all -gstabs" -- flags_dbg_all="$flags_dbg_all -gstabs+" -- flags_dbg_all="$flags_dbg_all -gcoff" -- flags_dbg_all="$flags_dbg_all -gxcoff" -- flags_dbg_all="$flags_dbg_all -gdwarf-2" -- flags_dbg_all="$flags_dbg_all -gvms" -+ flags_dbg_all="" - flags_dbg_yes="-g" -- flags_dbg_off="-g0" -- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" -- flags_opt_yes="-O2" -+ flags_dbg_off="" -+ flags_opt_all="" -+ flags_opt_yes="" - flags_opt_off="-O0" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 -index 1ea4d17..868d65a 100644 ---- a/m4/curl-compilers.m4 -+++ b/m4/curl-compilers.m4 -@@ -148,18 +148,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [ - gccvhi=`echo $gccver | cut -d . -f1` - gccvlo=`echo $gccver | cut -d . -f2` - compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` -- flags_dbg_all="-g -g0 -g1 -g2 -g3" -- flags_dbg_all="$flags_dbg_all -ggdb" -- flags_dbg_all="$flags_dbg_all -gstabs" -- flags_dbg_all="$flags_dbg_all -gstabs+" -- flags_dbg_all="$flags_dbg_all -gcoff" -- flags_dbg_all="$flags_dbg_all -gxcoff" -- flags_dbg_all="$flags_dbg_all -gdwarf-2" -- flags_dbg_all="$flags_dbg_all -gvms" -+ flags_dbg_all="" - flags_dbg_yes="-g" -- flags_dbg_off="-g0" -- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" -- flags_opt_yes="-O2" -+ flags_dbg_off="" -+ flags_opt_all="" -+ flags_opt_yes="" - flags_opt_off="-O0" - else - AC_MSG_RESULT([no]) diff --git a/gdk-pixbuf2/gdk-pixbuf2.nm b/gdk-pixbuf2/gdk-pixbuf2.nm index 3d0da3d..d13409d 100644 --- a/gdk-pixbuf2/gdk-pixbuf2.nm +++ b/gdk-pixbuf2/gdk-pixbuf2.nm @@ -4,8 +4,9 @@ ############################################################################### name = gdk-pixbuf2 -version = %{major_ver}.5 -major_ver = 2.26 +version = %{ver_major}.%{ver_minor} +ver_major = 2.27 +ver_minor = 1 release = 1 groups = System/Libraries @@ -20,7 +21,7 @@ end thisapp = gdk-pixbuf-%{version} -source_dl = http://download.gnome.org/sources/gdk-pixbuf/%{major_ver}/ +source_dl = http://download.gnome.org/sources/gdk-pixbuf/%{ver_major}/ sources = %{thisapp}.tar.xz build diff --git a/glib2/glib2.nm b/glib2/glib2.nm index d08a1b5..be45b4c 100644 --- a/glib2/glib2.nm +++ b/glib2/glib2.nm @@ -5,7 +5,7 @@ name = glib2 ver_major = 2.35 -ver_minor = 1 +ver_minor = 4 version = %{ver_major}.%{ver_minor} release = 1 thisapp = glib-%{version} diff --git a/gobject-introspection/gobject-introspection.nm b/gobject-introspection/gobject-introspection.nm index 30add8b..1f6bc03 100644 --- a/gobject-introspection/gobject-introspection.nm +++ b/gobject-introspection/gobject-introspection.nm @@ -7,8 +7,8 @@ name = gobject-introspection version = %{major_ver}.%{minor_ver} release = 1 -major_ver = 1.31 -minor_ver = 22 +major_ver = 1.35 +minor_ver = 4 groups = Development/Libraries url = http://live.gnome.org/GObjectIntrospection @@ -16,9 +16,9 @@ license = GPLv2+, LGPLv2+, MIT summary = Introspection system for GObject-based libraries. description - GObject Introspection can scan C header and source files in order \ - to generate introspection "typelib" files. It also provides an API to \ - examine typelib files, useful for creating language bindings among \ + GObject Introspection can scan C header and source files in order + to generate introspection "typelib" files. It also provides an API to + examine typelib files, useful for creating language bindings among other things. end @@ -38,10 +38,6 @@ build configure_options += \ --disable-static - - test - make check - end end packages @@ -55,6 +51,8 @@ packages template DEVEL requires = %{name}=%{thisver} + + files += %{datadir}/gir* end package %{name}-debuginfo diff --git a/harfbuzz/harfbuzz.nm b/harfbuzz/harfbuzz.nm index 7ab7e1e..c899b8d 100644 --- a/harfbuzz/harfbuzz.nm +++ b/harfbuzz/harfbuzz.nm @@ -4,7 +4,7 @@ ############################################################################### name = harfbuzz -version = 0.9.4 +version = 0.9.12 release = 1 groups = System/Libraries @@ -24,8 +24,12 @@ build cairo-devel freetype-devel glib2-devel + icu-devel end + configure_options += \ + --disable-static + test make check end diff --git a/icu/icu.nm b/icu/icu.nm new file mode 100644 index 0000000..9693bb1 --- /dev/null +++ b/icu/icu.nm @@ -0,0 +1,68 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = icu +version = %{ver_major}.%{ver_minor}.%{ver_plevel} +ver_major = 50 +ver_minor = 1 +ver_plevel = 2 +release = 1 + +groups = Development/Tools +url = http://www.icu-project.org +license = MIT and UCD and Public Domain +summary = International Components for Unicode. + +description + Tools and utilities for developing with icu. +end + +source_dl = http://download.icu-project.org/files/icu4c/%{version}/ +sources = icu4c-%{ver_major}_%{ver_minor}_%{ver_plevel}-src.tgz + +build + DIR_APP = %{DIR_SRC}/icu/source + + configure_options += \ + --disable-static \ + --with-data-packaging=library \ + --disable-samples + + configure_cmds + # There is no source/doc/html/search/ directory + sed -i '/^\s\+\$(INSTALL_DATA) \$(docsrchfiles) \$(DESTDIR)\$(docdir)\/\$(docsubsrchdir)\s*$/d' Makefile + + # The configure --disable-renaming and possibly other options result in icu/source/uconfig.h.prepend + # being created, include that content in icu/source/common/unicode/uconfig.h to propagate to consumer packages. + test -f uconfig.h.prepend && sed -e '/^#define __UCONFIG_H__/ r uconfig.h.prepend' \ + -i common/unicode/uconfig.h + end + + test + make check + end +end + +packages + package %{name} + + package lib%{name} + template LIBS + end + + package lib%{name}-devel + template DEVEL + + files += \ + %{bindir}/*config* \ + %{bindir}/icuinfo \ + %{libidir}/%{name} \ + %{datadir}/%{name} + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/pango/pango.nm b/pango/pango.nm index be1409d..7b7b5c7 100644 --- a/pango/pango.nm +++ b/pango/pango.nm @@ -4,8 +4,9 @@ ############################################################################### name = pango -major = 1.31 -version = %{major}.0 +version = %{ver_major}.%{ver_minor} +ver_major = 1.32 +ver_minor = 5 release = 1 groups = System/Libraries @@ -18,25 +19,26 @@ description emphasis on internationalization. end -source_dl = http://ftp.gnome.org/pub/GNOME/sources/pango/%{major}/ +source_dl = http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{ver_major}/ sources = %{thisapp}.tar.xz build requires - cairo-devel + cairo-gobject-devel fontconfig-devel freetype-devel gcc-c++ glib2-devel - glibc-devel - harfbuzz-devel + gobject-introspection-devel + harfbuzz-devel >= 0.9.9 libXft-devel perl pkg-config end configure_options += \ - --sysconfdir=/etc + --enable-introspection=yes + end packages @@ -47,7 +49,10 @@ packages requires glib2-devel + harfbuzz-devel end + + files += %{datadir}/gir* end package %{name}-debuginfo hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 68053bcc1d80d0422a1933b4394d75d1d426ed03
by git＠ipfire.org 12 Feb '13

12 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 68053bcc1d80d0422a1933b4394d75d1d426ed03 (commit) via 6329c650dcf31863bdeb904da3c39015d19001de (commit) from 91d3495aa0bb21141b3a9670a90ce9295c45f494 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 68053bcc1d80d0422a1933b4394d75d1d426ed03 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 12 20:13:59 2013 +0100 curl: Update to 7.29.0. Security fix for http://curl.haxx.se/docs/adv_20130206.html. commit 6329c650dcf31863bdeb904da3c39015d19001de Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 12 19:11:35 2013 +0100 Fix typo in Dutch translation. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/curl | 4 +++- langs/nl/install/lang_nl.c | 2 +- lfs/curl | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl index 2a9e16b..c556751 100644 --- a/config/rootfiles/common/curl +++ b/config/rootfiles/common/curl @@ -16,10 +16,11 @@ usr/bin/curl usr/lib/libcurl.so usr/lib/libcurl.so.3 usr/lib/libcurl.so.4 -usr/lib/libcurl.so.4.2.0 +usr/lib/libcurl.so.4.3.0 #usr/lib/pkgconfig/libcurl.pc #usr/share/man/man1/curl-config.1 #usr/share/man/man1/curl.1 +#usr/share/man/man1/mk-ca-bundle.1 #usr/share/man/man3/curl_easy_cleanup.3 #usr/share/man/man3/curl_easy_duphandle.3 #usr/share/man/man3/curl_easy_escape.3 @@ -57,6 +58,7 @@ usr/lib/libcurl.so.4.2.0 #usr/share/man/man3/curl_multi_socket_action.3 #usr/share/man/man3/curl_multi_strerror.3 #usr/share/man/man3/curl_multi_timeout.3 +#usr/share/man/man3/curl_multi_wait.3 #usr/share/man/man3/curl_share_cleanup.3 #usr/share/man/man3/curl_share_init.3 #usr/share/man/man3/curl_share_setopt.3 diff --git a/langs/nl/install/lang_nl.c b/langs/nl/install/lang_nl.c index 0153ca0..b9a8ec4 100644 --- a/langs/nl/install/lang_nl.c +++ b/langs/nl/install/lang_nl.c @@ -354,7 +354,7 @@ char *nl_tr[] = { /* TR_PHONENUMBER_CANNOT_BE_EMPTY */ "Telefoonnummer mag niet leeg zijn.", /* TR_PREPARE_HARDDISK */ -"Het installatieprogramma zal nu de vaste schijf voorbereiden op %s. Eerst wordt de schijf gepartitioneerd, daarna zullen de bestandssystemen erop worden gezet.\n\nALLE DATA OP DE SCHIJF ZAL WORDEN GEWIST. Wilt u hiermee doorgaan?"", +"Het installatieprogramma zal nu de vaste schijf voorbereiden op %s. Eerst wordt de schijf gepartitioneerd, daarna zullen de bestandssystemen erop worden gezet.\n\nALLE DATA OP DE SCHIJF ZAL WORDEN GEWIST. Wilt u hiermee doorgaan?", /* TR_PRESS_OK_TO_REBOOT */ "Druk Ok om te herstarten.", /* TR_PRIMARY_DNS */ diff --git a/lfs/curl b/lfs/curl index 5b6e3b8..1228f39 100644 --- a/lfs/curl +++ b/lfs/curl @@ -24,7 +24,7 @@ include Config -VER = 7.24.0 +VER = 7.29.0 THISAPP = curl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b93420f80a2baaa61a0f45214eddc2ba +$(DL_FILE)_MD5 = 4f57d3b4a3963038bd5e04dbff385390 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. bb10029704219063a42ef4119bf72e11a127c401
by git＠ipfire.org 12 Feb '13

12 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via bb10029704219063a42ef4119bf72e11a127c401 (commit) via bce502baf2584371bb69be6ea8679790f4cc4293 (commit) from d34edaf5c15e13330a5fa8bde00f9f3ddd47fe19 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bb10029704219063a42ef4119bf72e11a127c401 Merge: d34edaf bce502b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 12 19:37:43 2013 +0100 Merge remote-tracking branch 'stevee/parted-update' commit bce502baf2584371bb69be6ea8679790f4cc4293 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 12 19:30:06 2013 +0100 parted: Update to 3.1. This is a major update to the latest stable version. ----------------------------------------------------------------------- Summary of changes: parted/parted.nm | 16 +- ...1-blkid_topology_get_physical_sector_size.patch | 30 - ...parted-2.1-dasd-NULL-dereference-rh563419.patch | 26 - parted/patches/parted-2.1-default-alignment.patch | 842 --------------------- .../parted-2.1-gpt-clobber-pmbr-rh563211.patch | 146 ---- .../parted-2.1-mem-leak-fixes-rh556012.patch | 158 ---- .../parted-2.1-needs_clobber-rh566181.patch | 30 - 7 files changed, 4 insertions(+), 1244 deletions(-) delete mode 100644 parted/patches/parted-2.1-blkid_topology_get_physical_sector_size.patch delete mode 100644 parted/patches/parted-2.1-dasd-NULL-dereference-rh563419.patch delete mode 100644 parted/patches/parted-2.1-default-alignment.patch delete mode 100644 parted/patches/parted-2.1-gpt-clobber-pmbr-rh563211.patch delete mode 100644 parted/patches/parted-2.1-mem-leak-fixes-rh556012.patch delete mode 100644 parted/patches/parted-2.1-needs_clobber-rh566181.patch Difference in files: diff --git a/parted/parted.nm b/parted/parted.nm index bfe7cdd..3beb58a 100644 --- a/parted/parted.nm +++ b/parted/parted.nm @@ -4,8 +4,8 @@ ############################################################################### name = parted -version = 2.1 -release = 3 +version = 3.1 +release = 1 groups = Applications/System url = http://www.gnu.org/software/parted @@ -19,7 +19,8 @@ description to new hard disks. end -source_dl = +source_dl = http://ftp.gnu.org/gnu/parted/ +sources = %{thisapp}.tar.xz build requires @@ -33,17 +34,8 @@ build end configure_options += \ - --libdir=/%{lib} \ --enable-selinux \ --disable-Werror - - install_cmds - mkdir -pv %{BUILDROOT}%{libdir} - mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir} - rm -rf %{BUILDROOT}/%{lib}/libparted{,-2.1}.so - ln -svf ../../%{lib}/libparted-%{version}.so.0 %{BUILDROOT}%{libdir}/libparted-%{version}.so - ln -svf libparted-%{version}.so %{BUILDROOT}%{libdir}/libparted.so - end end packages diff --git a/parted/patches/parted-2.1-blkid_topology_get_physical_sector_size.patch b/parted/patches/parted-2.1-blkid_topology_get_physical_sector_size.patch deleted file mode 100644 index c0d9c9f..0000000 --- a/parted/patches/parted-2.1-blkid_topology_get_physical_sector_size.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 503c54ef274a923dcac337361936062b37a0ac1a Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede(a)redhat.com> -Date: Mon, 11 Jan 2010 11:46:36 +0100 -Subject: [PATCH parted 1/3] linux: use blkid_topology_get_physical_sector_size - -The official 2.17 release of util-linux-ng, has added a function to -get the physical sector size, use that instead of getting the -minimum io size. -* libparted/arch/linux.c(_device_set_sector_size): use -blkid_topology_get_physical_sector_size. ---- - libparted/arch/linux.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index aefe788..bf33059 100644 ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -668,7 +668,7 @@ _device_set_sector_size (PedDevice* dev) - dev->path, strerror (errno), PED_SECTOR_SIZE_DEFAULT); - } else { - dev->phys_sector_size = -- blkid_topology_get_minimum_io_size( -+ blkid_topology_get_physical_sector_size( - arch_specific->topology); - } - #endif --- -1.6.5.2 - diff --git a/parted/patches/parted-2.1-dasd-NULL-dereference-rh563419.patch b/parted/patches/parted-2.1-dasd-NULL-dereference-rh563419.patch deleted file mode 100644 index 477b7ae..0000000 --- a/parted/patches/parted-2.1-dasd-NULL-dereference-rh563419.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 122bc980e27334d0f6243b74fffc8d2cefe0eb5c Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede(a)redhat.com> -Date: Wed, 10 Feb 2010 14:11:14 +0100 -Subject: [PATCH parted] dasd: Fix NULL pointer dereference in dasd_read - -* libparted/labels/dasd.c (dasd_read): Fix NULL ptr dereference. ---- - libparted/labels/dasd.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libparted/labels/dasd.c b/libparted/labels/dasd.c -index 4b5840b..516d189 100644 ---- a/libparted/labels/dasd.c -+++ b/libparted/labels/dasd.c -@@ -399,7 +399,7 @@ dasd_read (PedDisk* disk) - - if (strncmp(PART_TYPE_SWAP, str, 6) == 0) { - fs = ped_file_system_probe(&part->geom); -- if (is_linux_swap(fs->name)) { -+ if (fs && is_linux_swap(fs->name)) { - dasd_data->system = PARTITION_LINUX_SWAP; - PDEBUG; - } --- -1.6.6 - diff --git a/parted/patches/parted-2.1-default-alignment.patch b/parted/patches/parted-2.1-default-alignment.patch deleted file mode 100644 index 80cd47a..0000000 --- a/parted/patches/parted-2.1-default-alignment.patch +++ /dev/null @@ -1,842 +0,0 @@ -From 6c4c8464c704b645ddeccce4c4931b8e9d11c3a8 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede(a)redhat.com> -Date: Fri, 29 Jan 2010 10:58:17 +0100 -Subject: [PATCH parted 1/7] linux: Fixup phys_sector_size setting - -1) Use the logical sector size as physical sector size instead of 512 - when not compiled with libblkid support, this fixes problems - with logical sector size > physical sector size. -2) blkid_topology_get_physical_sector_size() can return 0 when it could - not determine the physical sector size, handle this. -* libparted/arch/linux.c (_device_set_sector_size): Fixup -phys_sector_size setting. ---- - libparted/arch/linux.c | 17 +++++++++++------ - 2 files changed, 14 insertions(+), 6 deletions(-) - -diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index f3b54f0..4b7b9f5 100644 ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -654,22 +654,27 @@ _device_set_sector_size (PedDevice* dev) - dev->path, strerror (errno), PED_SECTOR_SIZE_DEFAULT); - } else { - dev->sector_size = (long long)sector_size; -+ dev->phys_sector_size = dev->sector_size; - } - - #if USE_BLKID - get_blkid_topology(arch_specific); - if (!arch_specific->topology) { -- ped_exception_throw ( -- PED_EXCEPTION_WARNING, -- PED_EXCEPTION_OK, -- _("Could not determine minimum io size for %s: %s.\n" -- "Using the default size (%lld)."), -- dev->path, strerror (errno), PED_SECTOR_SIZE_DEFAULT); -+ dev->phys_sector_size = 0; - } else { - dev->phys_sector_size = - blkid_topology_get_physical_sector_size( - arch_specific->topology); - } -+ if (dev->phys_sector_size == 0) { -+ ped_exception_throw ( -+ PED_EXCEPTION_WARNING, -+ PED_EXCEPTION_OK, -+ _("Could not determine physical sector size for %s.\n" -+ "Using the logical sector size (%lld)."), -+ dev->path, dev->sector_size); -+ dev->phys_sector_size = dev->sector_size; -+ } - #endif - - #if defined __s390__ || defined __s390x__ --- -1.6.6 - -From 4bb123a121b54d758f87fc6c38d8edab4ddc6d6b Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede(a)redhat.com> -Date: Fri, 29 Jan 2010 19:55:10 +0100 -Subject: [PATCH parted 2/7] libparted: Give device_get_*_alignment sane defaults - -When the topology info is incomplete or non existent, return something -more sensible then NULL (which ends up being interpreted as -PedAlignmentAny in most cases). The default minimum alignment aligns to -physical sector size, the default optimal alignment is 1 MiB, which is -what vista and windows 7 do. -* libparted/device.c (device_get_*_alignment): Add default aligments. ---- - libparted/device.c | 30 ++++++++++++++++++++++++++---- - 2 files changed, 33 insertions(+), 4 deletions(-) - -diff --git a/libparted/device.c b/libparted/device.c -index dda8d74..0f36a03 100644 ---- a/libparted/device.c -+++ b/libparted/device.c -@@ -501,10 +501,16 @@ ped_device_get_optimal_aligned_constraint(const PedDevice *dev) - PedAlignment* - ped_device_get_minimum_alignment(const PedDevice *dev) - { -+ PedAlignment *align = NULL; -+ - if (ped_architecture->dev_ops->get_minimum_alignment) -- return ped_architecture->dev_ops->get_minimum_alignment(dev); -+ align = ped_architecture->dev_ops->get_minimum_alignment(dev); -+ -+ if (align == NULL) -+ align = ped_alignment_new(0, -+ dev->phys_sector_size / dev->sector_size); - -- return NULL; /* ped_alignment_none */ -+ return align; - } - - /** -@@ -521,10 +527,26 @@ ped_device_get_minimum_alignment(const PedDevice *dev) - PedAlignment* - ped_device_get_optimum_alignment(const PedDevice *dev) - { -+ PedAlignment *align = NULL; -+ - if (ped_architecture->dev_ops->get_optimum_alignment) -- return ped_architecture->dev_ops->get_optimum_alignment(dev); -+ align = ped_architecture->dev_ops->get_optimum_alignment(dev); -+ -+ /* If the arch specific code could not give as an alignment -+ return a default value based on the type of device. */ -+ if (align == NULL) { -+ switch (dev->type) { -+ case PED_DEVICE_DASD: -+ align = ped_device_get_minimum_alignment(dev); -+ break; -+ default: -+ /* Align to a grain of 1MiB (like vista / win7) */ -+ align = ped_alignment_new(0, -+ 1048576 / dev->sector_size); -+ } -+ } - -- return NULL; /* ped_alignment_none */ -+ return align; - } - - /** @} */ --- -1.6.6 - -From 82f42a9e059a8f5dea46090889914041204ebe36 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede(a)redhat.com> -Date: Fri, 29 Jan 2010 19:59:06 +0100 -Subject: [PATCH parted 3/7] linux: handle incomplete topology information - -The topology information returned by libblkid is not always complete -(as the kernel does not always have complete information). -This patch makes the linux_get_*_alignment() alignment functions handle -this. The algorithm used for linux_get_optimum_alignment is: -1) Always use the reported aligment offset as offset -2a)If optimal io size is present in the topology info use that as grain -2b)If optimal io size is not present in topology info and aligment - offset is 0 and minimum io size is a power of 2, use the device.c - default optimal alignment (grain 1MiB). -2c)If not 2a and 2b, use the minimum io size, or if that is not defined - the physical sector size as grain (iow the minimum alignment). -The algorithm used for linux_get_minimum_alignment is: -1) Always use the reported aligment offset as offset -2) Use the minimum io size, or if that is not defined the physical - sector size as grain. -* libparted/arch/linux.c (linux_get_*_alignment): handle incomplete -topology information. ---- - libparted/arch/linux.c | 25 +++++++++++++++++++++---- - 1 files changed, 21 insertions(+), 4 deletions(-) - -diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index 4b7b9f5..a083028 100644 ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -2564,9 +2564,14 @@ PedAlignment* - linux_get_minimum_alignment(const PedDevice *dev) - { - blkid_topology tp = LINUX_SPECIFIC(dev)->topology; -+ if (!tp) -+ return NULL; - -- if (!tp || blkid_topology_get_minimum_io_size(tp) == 0) -- return NULL; /* ped_alignment_none */ -+ if (blkid_topology_get_minimum_io_size(tp) == 0) -+ return ped_alignment_new( -+ blkid_topology_get_alignment_offset(tp) / -+ dev->sector_size, -+ dev->phys_sector_size / dev->sector_size); - - return ped_alignment_new( - blkid_topology_get_alignment_offset(tp) / dev->sector_size, -@@ -2577,9 +2582,21 @@ PedAlignment* - linux_get_optimum_alignment(const PedDevice *dev) - { - blkid_topology tp = LINUX_SPECIFIC(dev)->topology; -+ if (!tp) -+ return NULL; -+ -+ /* If optimal_io_size is 0 _and_ alignment_offset is 0 _and_ -+ minimum_io_size is a power of 2 then go with the device.c default */ -+ unsigned long minimum_io_size = blkid_topology_get_minimum_io_size(tp); -+ if (blkid_topology_get_optimal_io_size(tp) == 0 && -+ blkid_topology_get_alignment_offset(tp) == 0 && -+ (minimum_io_size & (minimum_io_size - 1)) == 0) -+ return NULL; - -- if (!tp || blkid_topology_get_optimal_io_size(tp) == 0) -- return NULL; /* ped_alignment_none */ -+ /* If optimal_io_size is 0 and we don't meet the other criteria -+ for using the device.c default, return the minimum alignment. */ -+ if (blkid_topology_get_optimal_io_size(tp) == 0) -+ return linux_get_minimum_alignment(dev); - - return ped_alignment_new( - blkid_topology_get_alignment_offset(tp) / dev->sector_size, --- -1.6.6 - -From 4be1b004ad2c576fc093ca5227e22bb78b35f1fd Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede(a)redhat.com> -Date: Fri, 29 Jan 2010 23:28:13 +0100 -Subject: [PATCH parted 4/7] parted: Honor --align option also in mkpartfs, resize and print cmds - -parted/parted.c (do_mkpartfs,do_print,do_resize): honor --align ---- - parted/parted.c | 26 +++++++++++++++++++++++++- - 1 files changed, 25 insertions(+), 1 deletions(-) - -diff --git a/parted/parted.c b/parted/parted.c -index c4d1779..5ba8bbf 100644 ---- a/parted/parted.c -+++ b/parted/parted.c -@@ -949,6 +949,11 @@ do_mkpartfs (PedDevice** dev) - if (!disk) - goto error; - -+ if (ped_disk_is_flag_available(disk, PED_DISK_CYLINDER_ALIGNMENT)) -+ if (!ped_disk_set_flag(disk, PED_DISK_CYLINDER_ALIGNMENT, -+ alignment == ALIGNMENT_CYLINDER)) -+ goto error_destroy_disk; -+ - if (!ped_disk_type_check_feature (disk->type, PED_DISK_TYPE_EXTENDED)) { - part_type = PED_PARTITION_NORMAL; - } else { -@@ -989,7 +994,14 @@ do_mkpartfs (PedDevice** dev) - range_end); - PED_ASSERT (user_constraint != NULL, return 0); - -- dev_constraint = ped_device_get_constraint (*dev); -+ if (alignment == ALIGNMENT_OPTIMAL) -+ dev_constraint = -+ ped_device_get_optimal_aligned_constraint(*dev); -+ else if (alignment == ALIGNMENT_MINIMAL) -+ dev_constraint = -+ ped_device_get_minimal_aligned_constraint(*dev); -+ else -+ dev_constraint = ped_device_get_constraint(*dev); - PED_ASSERT (dev_constraint != NULL, return 0); - - final_constraint = ped_constraint_intersect (user_constraint, -@@ -1353,6 +1365,11 @@ do_print (PedDevice** dev) - if (!disk) - goto error; - -+ if (ped_disk_is_flag_available(disk, PED_DISK_CYLINDER_ALIGNMENT)) -+ if (!ped_disk_set_flag(disk, PED_DISK_CYLINDER_ALIGNMENT, -+ alignment == ALIGNMENT_CYLINDER)) -+ goto error_destroy_disk; -+ - peek_word = command_line_peek_word (); - if (peek_word) { - if (strncmp (peek_word, "devices", 7) == 0) { -@@ -1697,6 +1697,7 @@ do_print (PedDevice** dev) - - return 1; - -+error_destroy_disk: - ped_disk_destroy (disk); - error: - return 0; -@@ -1862,6 +1881,11 @@ do_resize (PedDevice** dev) - if (!disk) - goto error; - -+ if (ped_disk_is_flag_available(disk, PED_DISK_CYLINDER_ALIGNMENT)) -+ if (!ped_disk_set_flag(disk, PED_DISK_CYLINDER_ALIGNMENT, -+ alignment == ALIGNMENT_CYLINDER)) -+ goto error_destroy_disk; -+ - if (!command_line_get_partition (_("Partition number?"), disk, &part)) - goto error_destroy_disk; - if (part->type != PED_PARTITION_EXTENDED) { --- -1.6.6 - -From 950bfc92b1a67c8baa8c7cfab04103bd38a2d24b Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede(a)redhat.com> -Date: Fri, 29 Jan 2010 22:51:30 +0100 -Subject: [PATCH parted 5/7] parted: change warnings when initial constrained mkpart fails - -In do_mkpart we first try to create a partition using a constraint -derived from the user input intersected with the devices alignment -needs. And if that fails we try again without any constraint. - -However the warning given when this happens only takes into account -the user not getting what he asked for, while the alignment might be -a problem too (or even the only problem). So this patch adds a check -to see if the user really did not get what he asked before giving that -warning, and adds a new check + warning to see if the created partition -is properly aligned. -*parted/parted.c (do_mkpart,do_mkpartfs): change warnings when initial -constrained mkpart fails. ---- - parted/parted.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++------ - 1 files changed, 52 insertions(+), 7 deletions(-) - -diff --git a/parted/parted.c b/parted/parted.c -index 5ba8bbf..3ce356f 100644 ---- a/parted/parted.c -+++ b/parted/parted.c -@@ -178,6 +178,8 @@ static TimerContext timer_context; - - static int _print_list (); - static void _done (PedDevice* dev); -+static bool partition_align_check (PedDisk const *disk, -+ PedPartition const *part, enum AlignmentType a_type); - - static void - _timer_handler (PedTimer* timer, void* context) -@@ -833,7 +835,12 @@ do_mkpart (PedDevice** dev) - bool added_ok = ped_disk_add_partition (disk, part, - constraint_any); - ped_constraint_destroy (constraint_any); -- if (added_ok) { -+ -+ if (!added_ok) -+ goto error_remove_part; -+ -+ if (!ped_geometry_test_sector_inside(range_start, part->geom.start) || -+ !ped_geometry_test_sector_inside(range_end, part->geom.end)) { - start_usr = ped_unit_format (*dev, start); - end_usr = ped_unit_format (*dev, end); - start_sol = ped_unit_format (*dev, part->geom.start); -@@ -867,8 +874,23 @@ do_mkpart (PedDevice** dev) - /* undo partition addition */ - goto error_remove_part; - } -- } else { -- goto error_remove_part; -+ } -+ -+ if ((alignment == ALIGNMENT_OPTIMAL && -+ !partition_align_check(disk, part, PA_OPTIMUM)) || -+ (alignment == ALIGNMENT_MINIMAL && -+ !partition_align_check(disk, part, PA_MINIMUM))) { -+ if (ped_exception_throw( -+ PED_EXCEPTION_WARNING, -+ (opt_script_mode -+ ? PED_EXCEPTION_OK -+ : PED_EXCEPTION_IGNORE_CANCEL), -+ _("The resulting partition is not properly " -+ "aligned for best performance.")) == -+ PED_EXCEPTION_CANCEL) { -+ /* undo partition addition */ -+ goto error_remove_part; -+ } - } - } else { - ped_exception_leave_all(); -@@ -1018,8 +1040,16 @@ do_mkpartfs (PedDevice** dev) - if (!added_ok) { - ped_exception_leave_all(); - -- if (ped_disk_add_partition (disk, part, -- ped_constraint_any (*dev))) { -+ PedConstraint *constraint_any = ped_constraint_any (*dev); -+ bool added_ok = ped_disk_add_partition (disk, part, -+ constraint_any); -+ ped_constraint_destroy (constraint_any); -+ -+ if (!added_ok) -+ goto error_remove_part; -+ -+ if (!ped_geometry_test_sector_inside(range_start, part->geom.start) || -+ !ped_geometry_test_sector_inside(range_end, part->geom.end)) { - start_usr = ped_unit_format (*dev, start); - end_usr = ped_unit_format (*dev, end); - start_sol = ped_unit_format (*dev, part->geom.start); -@@ -1048,8 +1078,23 @@ do_mkpartfs (PedDevice** dev) - /* undo partition addition */ - goto error_remove_part; - } -- } else { -- goto error_remove_part; -+ } -+ -+ if ((alignment == ALIGNMENT_OPTIMAL && -+ !partition_align_check(disk, part, PA_OPTIMUM)) || -+ (alignment == ALIGNMENT_MINIMAL && -+ !partition_align_check(disk, part, PA_MINIMUM))) { -+ if (ped_exception_throw( -+ PED_EXCEPTION_WARNING, -+ (opt_script_mode -+ ? PED_EXCEPTION_OK -+ : PED_EXCEPTION_IGNORE_CANCEL), -+ _("The resulting partition is not properly " -+ "aligned for best performance.")) == -+ PED_EXCEPTION_CANCEL) { -+ /* undo partition addition */ -+ goto error_remove_part; -+ } - } - } else { - ped_exception_leave_all(); --- -1.6.6 - -From 6c2db872647816b84a5efc8c8995a019d47f89a9 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede(a)redhat.com> -Date: Sat, 30 Jan 2010 17:46:23 +0100 -Subject: [PATCH parted 6/7] Makefiles: Fix check-other-sector_sizes - -Atleast on my system check-other-sector_sizes was actually just testing -512 bytes sectors 4 times. This fixes this. -* Makefile.am: Fix check-other-sector_sizes ---- - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 0e80967..d5a32ef 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1415,7 +1415,7 @@ MAINTAINERCLEANFILES += \ - - .PHONY: ss-1024 ss-2048 ss-4096 - ss-1024 ss-2048 ss-4096: -- PARTED_SECTOR_SIZE=$(ss-,,$@) $(MAKE) check-recursive -+ PARTED_SECTOR_SIZE=$(subst ss-,,$@) $(MAKE) check-recursive - - # Run the regression test suite with different settings, - # to ensure it works with simulated partition sizes > 512. --- -1.6.6 - -From 6ba62ce27f84c5c931d021f4be4af0cce011bdbf Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede(a)redhat.com> -Date: Fri, 29 Jan 2010 20:30:18 +0100 -Subject: [PATCH parted 7/7] parted: Change default alignment to optimal - -parted/parted.c: change --align default value to optimal -tests/*.sh: adjust for alignment changes where necessary ---- - parted/parted.c | 2 +- - tests/t0220-gpt-msftres.sh | 4 ++-- - tests/t0280-gpt-corrupt.sh | 6 +++--- - tests/t2100-mkswap.sh | 14 +++++++------- - tests/t2200-dos-label-recog.sh | 11 ++++++----- - tests/t2300-dos-label-extended-bootcode.sh | 12 ++++++------ - tests/t3000-resize-fs.sh | 4 ++-- - tests/t4100-dvh-partition-limits.sh | 4 +++- - tests/t4100-msdos-partition-limits.sh | 22 +++++----------------- - tests/t4100-msdos-starting-sector.sh | 10 +++++----- - tests/t5000-tags.sh | 6 +++--- - tests/t8000-loop.sh | 1 + - tests/t9021-maxima.sh | 3 ++- - 14 files changed, 49 insertions(+), 53 deletions(-) - -diff --git a/parted/parted.c b/parted/parted.c -index 3ce356f..e35ce6a 100644 ---- a/parted/parted.c -+++ b/parted/parted.c -@@ -133,7 +133,7 @@ int pretend_input_tty = 0; - int opt_machine_mode = 0; - int disk_is_modified = 0; - int is_toggle_mode = 0; --int alignment = ALIGNMENT_CYLINDER; -+int alignment = ALIGNMENT_OPTIMAL; - - static const char* number_msg = N_( - "NUMBER is the partition number used by Linux. On MS-DOS disk labels, the " -diff --git a/tests/t0220-gpt-msftres.sh b/tests/t0220-gpt-msftres.sh -index 8ef885f..bbc415b 100755 ---- a/tests/t0220-gpt-msftres.sh -+++ b/tests/t0220-gpt-msftres.sh -@@ -35,8 +35,8 @@ NTFS - reiserfs - ' - --start=200 --part_size=100 -+start=2048 -+part_size=2048 - n_types=$(echo "$fs_types"|wc -w) - - # Create a "disk" with enough room for one partition per FS type, -diff --git a/tests/t0280-gpt-corrupt.sh b/tests/t0280-gpt-corrupt.sh -index 28c9035..5c48116 100755 ---- a/tests/t0280-gpt-corrupt.sh -+++ b/tests/t0280-gpt-corrupt.sh -@@ -43,7 +43,7 @@ poke() - dev=loop-file - - ss=$sector_size_ --n_sectors=200 -+n_sectors=5000 - - fail=0 - dd if=/dev/null of=$dev bs=$ss seek=$n_sectors || fail=1 -@@ -62,7 +62,7 @@ printf "BYT;\n$dev:${n_sectors}s:file:$sector_size_:$sector_size_:gpt:;\n" \ - compare exp out || fail=1 - - # create a partition --parted -s $dev mkpart sw linux-swap 60s 100s > empty 2>&1 || fail=1 -+parted -s $dev mkpart sw linux-swap 2048s 4095s > empty 2>&1 || fail=1 - compare /dev/null empty || fail=1 - - # We're going to change the name of the first partition, -@@ -123,7 +123,7 @@ compare exp err || fail=1 - parted -m -s $dev u s print > out 2>&1 || fail=1 - - # check for expected output --printf "BYT;\nfile\n1:60s:100s:41s::foo:;\n" > exp || fail=1 -+printf "BYT;\nfile\n1:2048s:4095s:2048s::foo:;\n" > exp || fail=1 - sed "s/.*gpt:;/file/" out > k && mv k out || fail=1 - compare exp out || fail=1 - -diff --git a/tests/t2100-mkswap.sh b/tests/t2100-mkswap.sh -index 1462e5d..1e4c444 100755 ---- a/tests/t2100-mkswap.sh -+++ b/tests/t2100-mkswap.sh -@@ -27,7 +27,7 @@ require_512_byte_sector_size_ - # table, ensure that the proper file system type (0x82) is used. - # Some releases, e.g. parted-1.8.8 would mistakenly use 0x83. - ###################################################################### --N=1M -+N=2M - dev=loop-file - dev2=loop-file-2 - test_expect_success \ -@@ -41,7 +41,7 @@ test_expect_success 'expect no output' 'compare out /dev/null' - - test_expect_success \ - 'create a partition' \ -- 'parted -s $dev mkpart primary 0 1 > out 2>&1' -+ 'parted -s $dev mkpart primary 2048s 4095s > out 2>&1' - test_expect_success 'expect no output' 'compare out /dev/null' - - test_expect_success \ -@@ -66,7 +66,7 @@ test_expect_success 'expect no output' 'compare out /dev/null' - - test_expect_success \ - 'create another partition' \ -- 'parted -s $dev2 mkpart primary 0 1 > out 2>&1' -+ 'parted -s $dev2 mkpart primary 2048s 4095s > out 2>&1' - test_expect_success 'expect no output' 'compare out /dev/null' - - test_expect_success \ -@@ -74,13 +74,13 @@ test_expect_success \ - 'parted -s $dev2 mkfs 1 "linux-swap(v1)" > out 2>&1' - test_expect_success 'expect no output' 'compare out /dev/null' - --# partition starts at offset 16384; swap UUID is 1036 bytes in -+# partition starts at offset 1048576; swap UUID is 1036 bytes in - test_expect_success \ - 'extract UUID 1' \ -- 'od -t x1 -An -j17420 -N16 $dev > uuid1' -+ 'od -t x1 -An -j1049612 -N16 $dev > uuid1' - test_expect_success \ - 'extract UUID 2' \ -- 'od -t x1 -An -j17420 -N16 $dev2 > uuid2' -+ 'od -t x1 -An -j1049612 -N16 $dev2 > uuid2' - test_expect_failure \ - 'two linux-swap file systems have different UUIDs' \ - 'compare uuid1 uuid2' -@@ -92,7 +92,7 @@ test_expect_success 'expect no output' 'compare out /dev/null' - - test_expect_success \ - 'extract new UUID 2' \ -- 'od -t x1 -An -j17420 -N16 $dev2 > uuid2-new' -+ 'od -t x1 -An -j1049612 -N16 $dev2 > uuid2-new' - test_expect_success \ - 'check preserves linux-swap UUID' \ - 'compare uuid2 uuid2-new' -diff --git a/tests/t2200-dos-label-recog.sh b/tests/t2200-dos-label-recog.sh -index 1254226..92e6d42 100755 ---- a/tests/t2200-dos-label-recog.sh -+++ b/tests/t2200-dos-label-recog.sh -@@ -25,11 +25,12 @@ test_description='improved MSDOS partition-table recognition' - # parted 1.8.8.1.29 and earlier would fail to recognize a DOS - # partition table. - ###################################################################### --N=10M -+ss=$sector_size_ -+N=8192 - dev=loop-file - test_expect_success \ - 'create a file to simulate the underlying device' \ -- 'dd if=/dev/null of=$dev bs=1 seek=$N 2> /dev/null' -+ 'dd if=/dev/null of=$dev bs=$ss seek=$N 2> /dev/null' - - test_expect_success \ - 'label the test disk' \ -@@ -39,8 +40,8 @@ test_expect_success 'expect no output' 'compare out /dev/null' - test_expect_success \ - 'create two partition' \ - ' -- parted -s $dev mkpart primary 1s 40s > out 2>&1 && -- parted -s $dev mkpart primary 41s 80s >> out 2>&1 -+ parted -s $dev mkpart primary 2048s 4095s > out 2>&1 && -+ parted -s $dev mkpart primary 4096s 8191s >> out 2>&1 - - ' - test_expect_success 'expect no output' 'compare out /dev/null' -@@ -54,7 +55,7 @@ test_expect_success \ - ' - parted -m -s $dev unit s p > out && - tail -2 out > k && mv k out && -- printf "1:1s:40s:40s:::;\n2:41s:80s:40s:::;\n" > exp -+ printf "1:2048s:4095s:2048s:::;\n2:4096s:8191s:4096s:::;\n" > exp - - ' - test_expect_success 'expect two partitions' 'compare out exp' -diff --git a/tests/t2300-dos-label-extended-bootcode.sh b/tests/t2300-dos-label-extended-bootcode.sh -index 6f2b219..73fa45b 100755 ---- a/tests/t2300-dos-label-extended-bootcode.sh -+++ b/tests/t2300-dos-label-extended-bootcode.sh -@@ -27,7 +27,7 @@ bootcode_size=446 - - test_expect_success \ - 'Create the test file' \ -- 'dd if=/dev/zero of=$dev bs=1024c count=100 >/dev/null 2>&1' -+ 'dd if=/dev/zero of=$dev bs=1M count=4 >/dev/null 2>&1' - - test_expect_success \ - 'Create msdos label' \ -@@ -36,23 +36,23 @@ test_expect_success 'Expect no output' 'compare out /dev/null' - - test_expect_success \ - 'Create extended partition' \ -- 'parted -s $dev mkpart extended 32s 127s > out 2>&1' -+ 'parted -s $dev mkpart extended 2048s 8191s > out 2>&1' - test_expect_success 'Expect no output' 'compare out /dev/null' - - test_expect_success \ - 'Create logical partition' \ -- 'parted -s $dev mkpart logical 64s 127s > out 2>&1' -+ 'parted -s $dev mkpart logical 4096s 8191s > out 2>&1' - test_expect_success 'Expect no output' 'compare out /dev/null' - - test_expect_success \ - 'Install fake bootcode' \ - 'printf %0${bootcode_size}d 0 > in && -- dd if=in of=$dev bs=1c seek=16384 count=$bootcode_size \ -+ dd if=in of=$dev bs=1c seek=1M count=$bootcode_size \ - conv=notrunc > /dev/null 2>&1' - - test_expect_success \ - 'Save fake bootcode for later comparison' \ -- 'dd if=$dev of=before bs=1 skip=16384 count=$bootcode_size > /dev/null 2>&1' -+ 'dd if=$dev of=before bs=1 skip=1M count=$bootcode_size > /dev/null 2>&1' - - test_expect_success \ - 'Do something to the label' \ -@@ -61,7 +61,7 @@ test_expect_success 'Expect no output' 'compare out /dev/null' - - test_expect_success \ - 'Extract the bootcode for comparison' \ -- 'dd if=$dev of=after bs=1 skip=16384 count=$bootcode_size > /dev/null 2>&1' -+ 'dd if=$dev of=after bs=1 skip=1M count=$bootcode_size > /dev/null 2>&1' - - test_expect_success \ - 'Expect bootcode has not changed' \ -diff --git a/tests/t3000-resize-fs.sh b/tests/t3000-resize-fs.sh -index 2abc71b..d6af67d 100755 ---- a/tests/t3000-resize-fs.sh -+++ b/tests/t3000-resize-fs.sh -@@ -64,8 +64,8 @@ for fs_type in hfs+ fat32; do - - # create an empty $fs_type partition, cylinder aligned, size > 256 MB - parted -s $dev mkpart primary $fs_type $start $default_end > out 2>&1 || fail=1 -- # expect no output -- compare out /dev/null || fail=1 -+ echo "Warning: The resulting partition is not properly aligned for best performance." > exp -+ compare out exp || fail=1 - - # print partition table - parted -m -s $dev u s p > out 2>&1 || fail=1 -diff --git a/tests/t4100-dvh-partition-limits.sh b/tests/t4100-dvh-partition-limits.sh -index 01e3078..17b1530 100755 ---- a/tests/t4100-dvh-partition-limits.sh -+++ b/tests/t4100-dvh-partition-limits.sh -@@ -33,11 +33,13 @@ fs=fs_file - mp=`pwd`/mount-point - n=4096 - -+# We must use -f otherwise newer mkfs.xfs fail with: -+# mkfs.xfs: probe of test.img failed, cannot detect existing filesystem. - test_expect_success \ - 'create an XFS file system' \ - ' - dd if=/dev/zero of=$fs bs=1MB count=2 seek=20 && -- mkfs.xfs -q $fs && -+ mkfs.xfs -f -q $fs && - mkdir "$mp" - - ' -diff --git a/tests/t4100-msdos-partition-limits.sh b/tests/t4100-msdos-partition-limits.sh -index 0c5b404..b9f168a 100755 ---- a/tests/t4100-msdos-partition-limits.sh -+++ b/tests/t4100-msdos-partition-limits.sh -@@ -33,11 +33,13 @@ fs=fs_file - mp=`pwd`/mount-point - n=4096 - -+# We must use -f otherwise newer mkfs.xfs fail with: -+# mkfs.xfs: probe of test.img failed, cannot detect existing filesystem. - test_expect_success \ - 'create an XFS file system' \ - ' - dd if=/dev/zero of=$fs bs=1MB count=2 seek=20 && -- mkfs.xfs -q $fs && -+ mkfs.xfs -f -q $fs && - mkdir "$mp" - - ' -@@ -102,27 +104,13 @@ test_expect_success \ - 'check for new diagnostic' \ - 'bad_part_length 4294967296 > exp && diff -u err exp' - --# FIXME: investigate this. --# Unexpectedly to me, both of these failed with this same diagnostic: --# --# Error: partition length of 4294967296 sectors exceeds the \ --# DOS-partition-table-imposed maximum of 2^32-1" > exp && --# --# I expected the one below to fail with a length of _4294967297_. --# Debugging, I see that _check_partition *does* detect this, --# but the diagnostic doesn't get displayed because of the wonders --# of parted's exception mechanism. -- - test_expect_failure \ - "$table_type: a partition length of 2^32+1 sectors provokes failure." \ - 'do_mkpart $n $(echo $n+2^32|bc) > err 2>&1' - --# FIXME: odd that we asked for 2^32+1, yet the diagnostic says 2^32 --# FIXME: Probably due to constraints. --# FIXME: For now, just accept the current output. - test_expect_success \ - 'check for new diagnostic' \ -- 'bad_part_length 4294967296 > exp && diff -u err exp' -+ 'bad_part_length 4294967297 > exp && diff -u err exp' - - # ========================================================= - # Now consider partition starting sector numbers. -@@ -164,7 +152,7 @@ test_expect_failure \ - 'do_mkpart_start_and_len $(echo 2^32+1|bc) 1000 > err 2>&1' - test_expect_success \ - 'check for new diagnostic' \ -- 'bad_start_sector 4294967296 > exp && diff -u err exp' -+ 'bad_start_sector 4294967297 > exp && diff -u err exp' - - done - -diff --git a/tests/t4100-msdos-starting-sector.sh b/tests/t4100-msdos-starting-sector.sh -index 7761e75..3d0233b 100755 ---- a/tests/t4100-msdos-starting-sector.sh -+++ b/tests/t4100-msdos-starting-sector.sh -@@ -27,7 +27,7 @@ ss=$sector_size_ - # consistent in the use of metadata padding for msdos labels. - ###################################################################### - --N=200 # number of sectors -+N=4096 # number of sectors - dev=loop-file - test_expect_success \ - 'create a file to simulate the underlying device' \ -@@ -43,7 +43,7 @@ fail=0 - cat <<EOF > exp || fail=1 - BYT; - path:${N}s:file:$ss:$ss:msdos:; --1:32s:127s:96s:free; -+1:32s:4095s:4064s:free; - EOF - - test_expect_success 'create expected output file' 'test $fail = 0' -@@ -62,15 +62,15 @@ fail=0 - cat <<EOF > exp || fail=1 - BYT; - path:${N}s:file:$ss:$ss:msdos:; --1:32s:50s:19s:free; --1:51s:199s:149s:::; -+1:32s:2047s:2016s:free; -+1:2048s:4095s:2048s:::; - EOF - - test_expect_success 'create expected output file' 'test $fail = 0' - - test_expect_success \ - 'create a partition at the end of the label' \ -- 'parted -s $dev mkpart primary 51s 199s' -+ 'parted -s $dev mkpart primary 2048s 4095s' - - test_expect_success \ - 'display output of label with partition' \ -diff --git a/tests/t5000-tags.sh b/tests/t5000-tags.sh -index d1e9533..9b0a1cc 100755 ---- a/tests/t5000-tags.sh -+++ b/tests/t5000-tags.sh -@@ -22,10 +22,10 @@ test_description="test bios_grub flag in gpt labels" - ss=$sector_size_ - - dev=loop-file --N=300 # number of sectors -+N=4200 # number of sectors - --part_sectors=128 --start_sector=60 -+part_sectors=2048 -+start_sector=2048 - end_sector=$(expr $start_sector + $part_sectors - 1) - - test_expect_success \ -diff --git a/tests/t8000-loop.sh b/tests/t8000-loop.sh -index 313e3b8..cba3454 100755 ---- a/tests/t8000-loop.sh -+++ b/tests/t8000-loop.sh -@@ -25,6 +25,7 @@ fi - . $srcdir/t-lib.sh - - require_root_ -+lvm_init_root_dir_ - - d1= f1= - cleanup_() -diff --git a/tests/t9021-maxima.sh b/tests/t9021-maxima.sh -index 999a696..c8316bc 100755 ---- a/tests/t9021-maxima.sh -+++ b/tests/t9021-maxima.sh -@@ -25,6 +25,7 @@ fi - . $srcdir/t-lib.sh - - fail=0 -+ss=$sector_size_ - dev=dev-file - PATH="..:$PATH" - export PATH -@@ -33,7 +34,7 @@ export PATH - for t in msdos gpt dvh sun mac bsd amiga loop pc98; do - echo $t - rm -f $dev -- dd if=/dev/zero of=$dev bs=512 count=1 seek=10000 || { fail=1; continue; } -+ dd if=/dev/zero of=$dev bs=$ss count=1 seek=10000 || { fail=1; continue; } - parted -s $dev mklabel $t || { fail=1; continue; } - - #case $t in pc98) sleep 999d;; esac --- -1.6.6 - diff --git a/parted/patches/parted-2.1-gpt-clobber-pmbr-rh563211.patch b/parted/patches/parted-2.1-gpt-clobber-pmbr-rh563211.patch deleted file mode 100644 index 2c3e030..0000000 --- a/parted/patches/parted-2.1-gpt-clobber-pmbr-rh563211.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 28be933ce317f954be1e39a50d8f42197d6e3c15 Mon Sep 17 00:00:00 2001 -From: Jim Meyering <meyering(a)redhat.com> -Date: Sun, 7 Feb 2010 20:31:11 +0100 -Subject: [PATCH parted 01/10] gpt: read-only operation could clobber MBR part of hybrid GPT+MBR table - -* libparted/labels/gpt.c (gpt_read): Fix a bug introduced by me in -commit 7f753b1b, "gpt: rewrite GPT header-reading code". -Set write_back=0 in one more code path. -* tests/Makefile.am (TESTS): Add t0205-gpt-list-clobbers-pmbr.sh. -* tests/t0205-gpt-list-clobbers-pmbr.sh: New test. -Reported by aix27249 in -http://parted.alioth.debian.org/cgi-bin/trac.cgi/ticket/250 ---- - libparted/labels/gpt.c | 10 ++++-- - tests/Makefile.am | 1 + - tests/t0205-gpt-list-clobbers-pmbr.sh | 59 +++++++++++++++++++++++++++++++++ - 4 files changed, 72 insertions(+), 3 deletions(-) - create mode 100644 tests/t0205-gpt-list-clobbers-pmbr.sh - -diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c -index 9d9876c..ea96a3b 100644 ---- a/libparted/labels/gpt.c -+++ b/libparted/labels/gpt.c -@@ -4,7 +4,7 @@ - original version by Matt Domsch <Matt_Domsch(a)dell.com> - Disclaimed into the Public Domain - -- Portions Copyright (C) 2001-2003, 2005-2009 Free Software Foundation, Inc. -+ Portions Copyright (C) 2001-2003, 2005-2010 Free Software Foundation, Inc. - - EFI GUID Partition Table handling - Per Intel EFI Specification v1.02 -@@ -932,9 +932,9 @@ gpt_read (PedDisk *disk) - if (primary_gpt && backup_gpt) - { - /* Both are valid. */ -+#ifndef DISCOVER_ONLY - if (PED_LE64_TO_CPU (primary_gpt->AlternateLBA) < disk->dev->length - 1) - { --#ifndef DISCOVER_ONLY - switch (ped_exception_throw - (PED_EXCEPTION_ERROR, - (PED_EXCEPTION_FIX | PED_EXCEPTION_CANCEL -@@ -954,8 +954,12 @@ gpt_read (PedDisk *disk) - write_back = 0; - break; - } --#endif /* !DISCOVER_ONLY */ - } -+ else -+ { -+ write_back = 0; -+ } -+#endif /* !DISCOVER_ONLY */ - gpt = primary_gpt; - pth_free (backup_gpt); - } -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 7bfb22e..38922f6 100644 ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -9,6 +9,7 @@ TESTS = \ - t0200-gpt.sh \ - t0201-gpt.sh \ - t0202-gpt-pmbr.sh \ -+ t0205-gpt-list-clobbers-pmbr.sh \ - t0220-gpt-msftres.sh \ - t0250-gpt.sh \ - t0280-gpt-corrupt.sh \ -@@ -1261,6 +1261,8 @@ t0201-gpt.sh.log: t0201-gpt.sh - @p='t0201-gpt.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) - t0202-gpt-pmbr.sh.log: t0202-gpt-pmbr.sh - @p='t0202-gpt-pmbr.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) -+t0205-gpt-list-clobbers-pmbr.sh.log: t0205-gpt-list-clobbers-pmbr.sh -+ @p='t0205-gpt-list-clobbers-pmbr.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) - t0220-gpt-msftres.sh.log: t0220-gpt-msftres.sh - @p='t0220-gpt-msftres.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) - t0250-gpt.sh.log: t0250-gpt.sh -diff --git a/tests/t0205-gpt-list-clobbers-pmbr.sh b/tests/t0205-gpt-list-clobbers-pmbr.sh -new file mode 100644 -index 0000000..979a15e ---- /dev/null -+++ b/tests/t0205-gpt-list-clobbers-pmbr.sh -@@ -0,0 +1,59 @@ -+#!/bin/sh -+# Ensure that printing a GPT partition table does not modify the pMBR. -+# Due to a bug in parted-2.1, "parted /dev/... print" would do just that. -+# Not a problem for most, but if you have a hybrid, e.g., gptsync'd -+# GPT/MBR table, merely listing the table with Parted-2.1 would clobber -+# the MBR part. -+ -+# Copyright (C) 2010 Free Software Foundation, Inc. -+ -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3 of the License, or -+# (at your option) any later version. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+ -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see <http://www.gnu.org/licenses/>. -+ -+if test "$VERBOSE" = yes; then -+ set -x -+ parted --version -+fi -+ -+: ${srcdir=.} -+. $srcdir/t-lib.sh -+ -+fail=0 -+ -+ss=$sector_size_ -+n_sectors=400 -+dev=dev-file -+ -+dd if=/dev/null of=$dev bs=$ss seek=$n_sectors || fail=1 -+parted -s $dev mklabel gpt || fail=1 -+parted -s $dev mkpart p1 101s 150s || fail=1 -+parted -s $dev mkpart p2 151s 200s || fail=1 -+parted -s $dev mkpart p3 201s 250s || fail=1 -+ -+parted -m -s $dev u s p || fail=1 -+ -+# Write non-NUL bytes all over the MBR, so we're likely to see any change. -+# However, be careful to leave the type of the first partition, 0xEE, -+# as well as the final two magic bytes. -+printf '%0450d\xee%059d\x55\xaa' 0 0 | dd of=$dev count=1 conv=notrunc || fail=1 -+ -+dd if=$dev of=before count=1 || fail=1 -+ -+chmod a-w $dev -+parted -m -s $dev u s p || fail=1 -+ -+dd if=$dev of=after count=1 || fail=1 -+ -+cmp before after || fail=1 -+ -+Exit $fail --- -1.6.6 - diff --git a/parted/patches/parted-2.1-mem-leak-fixes-rh556012.patch b/parted/patches/parted-2.1-mem-leak-fixes-rh556012.patch deleted file mode 100644 index 01129ae..0000000 --- a/parted/patches/parted-2.1-mem-leak-fixes-rh556012.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 358c9846a014247605d8da47b6917cac1344de00 Mon Sep 17 00:00:00 2001 -From: Jim Meyering <meyering(a)redhat.com> -Date: Fri, 15 Jan 2010 20:14:38 +0100 -Subject: [PATCH] dos: don't leak a constraint upon partition-add failure - -* libparted/labels/dos.c (read_table): Free constraint upon failure. ---- - libparted/labels/dos.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/libparted/labels/dos.c b/libparted/labels/dos.c -index 6b8d6cb..339acf4 100644 ---- a/libparted/labels/dos.c -+++ b/libparted/labels/dos.c -@@ -873,7 +873,6 @@ read_table (PedDisk* disk, PedSector sector, int is_extended_table) - PedPartition* part; - PedPartitionType type; - PedSector lba_offset; -- PedConstraint* constraint_exact; - - PED_ASSERT (disk != NULL, return 0); - PED_ASSERT (disk->dev != NULL, return 0); -@@ -944,10 +943,12 @@ read_table (PedDisk* disk, PedSector sector, int is_extended_table) - if (type != PED_PARTITION_EXTENDED) - part->fs_type = ped_file_system_probe (&part->geom); - -- constraint_exact = ped_constraint_exact (&part->geom); -- if (!ped_disk_add_partition (disk, part, constraint_exact)) -- goto error; -+ PedConstraint *constraint_exact -+ = ped_constraint_exact (&part->geom); -+ bool ok = ped_disk_add_partition (disk, part, constraint_exact); - ped_constraint_destroy (constraint_exact); -+ if (!ok) -+ goto error; - - /* non-nested extended partition */ - if (part->type == PED_PARTITION_EXTENDED) { --- -1.6.3.3 - -From d0cec198183be0b9989e4bc729c2930c7cdfe545 Mon Sep 17 00:00:00 2001 -From: Jim Meyering <meyering(a)redhat.com> -Date: Fri, 15 Jan 2010 19:53:36 +0100 -Subject: [PATCH] gpt: don't leak a constraint upon partition-add failure - -* libparted/labels/gpt.c (gpt_read): Free constraint upon failure. ---- - libparted/labels/gpt.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c -index 76537fd..9d9876c 100644 ---- a/libparted/labels/gpt.c -+++ b/libparted/labels/gpt.c -@@ -1020,7 +1020,6 @@ gpt_read (PedDisk *disk) - GuidPartitionEntry_t *pte - = (GuidPartitionEntry_t *) ((char *) ptes + i * p_ent_size); - PedPartition *part; -- PedConstraint *constraint_exact; - - if (!guid_cmp (pte->PartitionTypeGuid, UNUSED_ENTRY_GUID)) - continue; -@@ -1032,9 +1031,10 @@ gpt_read (PedDisk *disk) - part->fs_type = ped_file_system_probe (&part->geom); - part->num = i + 1; - -- constraint_exact = ped_constraint_exact (&part->geom); -+ PedConstraint *constraint_exact = ped_constraint_exact (&part->geom); - if (!ped_disk_add_partition (disk, part, constraint_exact)) - { -+ ped_constraint_destroy (constraint_exact); - ped_partition_destroy (part); - goto error_delete_all; - } --- -1.6.3.3 - -From 952e4919befce199b096fd1bbde93ef7902239d3 Mon Sep 17 00:00:00 2001 -From: Jim Meyering <meyering(a)redhat.com> -Date: Fri, 15 Jan 2010 19:34:00 +0100 -Subject: [PATCH] gpt: do not leak a GPT header on an error path - -* libparted/labels/gpt.c (gpt_write): Avoid a leak by freeing the -header buffer after pth_get_raw call where it's used, but before -checking whether that pth_get_raw call succeeded. -Avoid another leak in identical just 10 lines down. -Add "FIXME: caution..." comments to warn about the duplication. ---- - libparted/labels/gpt.c | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c -index fe1f300..76537fd 100644 ---- a/libparted/labels/gpt.c -+++ b/libparted/labels/gpt.c -@@ -1208,11 +1208,13 @@ gpt_write (const PedDisk *disk) - goto error_free_ptes; - - /* Write PTH and PTEs */ -+ /* FIXME: Caution: this code is nearly identical to what's just below. */ - if (_generate_header (disk, 0, ptes_crc, &gpt) != 0) - goto error_free_ptes; -- if ((pth_raw = pth_get_raw (disk->dev, gpt)) == NULL) -- goto error_free_ptes; -+ pth_raw = pth_get_raw (disk->dev, gpt); - pth_free (gpt); -+ if (pth_raw == NULL) -+ goto error_free_ptes; - int write_ok = ped_device_write (disk->dev, pth_raw, 1, 1); - free (pth_raw); - if (!write_ok) -@@ -1222,11 +1224,13 @@ gpt_write (const PedDisk *disk) - goto error_free_ptes; - - /* Write Alternate PTH & PTEs */ -+ /* FIXME: Caution: this code is nearly identical to what's just above. */ - if (_generate_header (disk, 1, ptes_crc, &gpt) != 0) - goto error_free_ptes; -- if ((pth_raw = pth_get_raw (disk->dev, gpt)) == NULL) -- goto error_free_ptes; -+ pth_raw = pth_get_raw (disk->dev, gpt); - pth_free (gpt); -+ if (pth_raw == NULL) -+ goto error_free_ptes; - write_ok = ped_device_write (disk->dev, pth_raw, disk->dev->length - 1, 1); - free (pth_raw); - if (!write_ok) --- -1.6.3.3 - -From 19b072592a7a551a861c200be58aef04a7546fb9 Mon Sep 17 00:00:00 2001 -From: Jim Meyering <meyering(a)redhat.com> -Date: Fri, 15 Jan 2010 18:56:37 +0100 -Subject: [PATCH] libparted: avoid double-free on an OOM failure path - -* libparted/disk.c (ped_disk_check): Don't double-free "fs_size". ---- - libparted/disk.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/libparted/disk.c b/libparted/disk.c -index c14d005..2d27b7c 100644 ---- a/libparted/disk.c -+++ b/libparted/disk.c -@@ -632,7 +632,9 @@ ped_disk_check (const PedDisk* disk) - walk->num, part_size, fs_size); - - free (part_size); -+ - free (fs_size); -+ fs_size = NULL; - - if (choice != PED_EXCEPTION_IGNORE) - return 0; --- -1.6.3.3 - diff --git a/parted/patches/parted-2.1-needs_clobber-rh566181.patch b/parted/patches/parted-2.1-needs_clobber-rh566181.patch deleted file mode 100644 index 50be7c5..0000000 --- a/parted/patches/parted-2.1-needs_clobber-rh566181.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 38fe6955c11a8bbcdda050401f46abe25dced000 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede(a)redhat.com> -Date: Thu, 18 Feb 2010 14:24:32 +0100 -Subject: [PATCH parted] libparted: copy needs_clobber value in ped_disk_duplicate() - -Most duplicate disk_ops use ped_disk_new_fresh, which sets needs_clobber -to 1. This would lead to clobbering the disk when committing a duplicate -disk even when the original disk was not made with ped_disk_new_fresh. -* libparted/disk.c (ped_disk_duplicate): copy needs_clobber value. ---- - libparted/disk.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/libparted/disk.c b/libparted/disk.c -index b819d59..fc5ef17 100644 ---- a/libparted/disk.c -+++ b/libparted/disk.c -@@ -276,6 +276,9 @@ ped_disk_duplicate (const PedDisk* old_disk) - } - if (!_disk_pop_update_mode (new_disk)) - goto error_destroy_new_disk; -+ -+ new_disk->needs_clobber = old_disk->needs_clobber; -+ - return new_disk; - - error_destroy_new_disk: --- -1.7.0 - hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. d34edaf5c15e13330a5fa8bde00f9f3ddd47fe19
by git＠ipfire.org 12 Feb '13

12 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via d34edaf5c15e13330a5fa8bde00f9f3ddd47fe19 (commit) via 4bda3d1f9a856a6673773a4ea5f6ef6c2f8db709 (commit) via 1bf1539ed21bf029b450117c992e9ff207e17b8f (commit) via 221945a52c3b2e00a8ce5006dbaad60755a58531 (commit) via a53e38ce7f2a4448937d9812076e32df6104cd29 (commit) via 09c1d1a921bb92bb90b325c63035b722ca8fc9c7 (commit) via f81a1d0ac6102eee57464bed375d4aa51f869331 (commit) from 743186103f1513088a85625ba03a0eabcd5b4fc6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d34edaf5c15e13330a5fa8bde00f9f3ddd47fe19 Merge: 4bda3d1 221945a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 12 19:17:24 2013 +0100 Merge remote-tracking branch 'ms/remove-nss' commit 4bda3d1f9a856a6673773a4ea5f6ef6c2f8db709 Merge: ef8980a 1bf1539 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 12 19:16:57 2013 +0100 Merge remote-tracking branch 'stevee/libXcomposite' commit 1bf1539ed21bf029b450117c992e9ff207e17b8f Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 12 19:13:20 2013 +0100 libXcomposite: New package. commit 221945a52c3b2e00a8ce5006dbaad60755a58531 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 10 23:13:16 2013 +0100 apr-util: Don't link against nss. Also fix packaging the openssl package and update to libdb (was db4). commit a53e38ce7f2a4448937d9812076e32df6104cd29 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 10 23:08:58 2013 +0100 curl: Use openssl instead of nss. nss is removed from the distribution. commit 09c1d1a921bb92bb90b325c63035b722ca8fc9c7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 10 23:08:15 2013 +0100 glibc: Don't link against nss. nss is removed from the distribution. commit f81a1d0ac6102eee57464bed375d4aa51f869331 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 10 22:58:07 2013 +0100 Remove nss and nspr. As there are plenty of other SSL implementations in this distribution, nss is dropped. ----------------------------------------------------------------------- Summary of changes: apr-util/apr-util.nm | 27 +- curl/curl.nm | 8 +- glibc/glibc.nm | 4 +- .../libXcomposite.nm | 8 +- nspr/nspr-config-vars.in | 2 - nspr/nspr.nm | 110 ---- nspr/nspr.pc.in | 10 - nspr/patches/nspr-config-pc.patch | 48 -- nss/PayPalEE.cert | Bin 1483 -> 0 bytes nss/cert8.db | Bin 65536 -> 0 bytes nss/cert9.db | Bin 9216 -> 0 bytes nss/key3.db | Bin 16384 -> 0 bytes nss/key4.db | Bin 11264 -> 0 bytes nss/nss-config.in | 145 ----- nss/nss-util-config.in | 118 ---- nss/nss-util.pc.in | 11 - nss/nss.nm | 263 --------- nss/nss.pc.in | 11 - nss/patches/0001-Bug-695011-PEM-logging.patch | 107 ---- nss/patches/0001-libnsspem-rhbz-734760.patch | 21 - ...72-protect-against-calls-before-nss_init.patch0 | 40 -- nss/patches/gnuc-minor-def-fix.patch | 12 - nss/patches/nofipstest.patch0 | 19 - nss/patches/nosha224.patch0 | 618 -------------------- nss/patches/nss-646045.patch0 | 34 -- nss/patches/nss-ckbi-1.88.rtm.patch0 | 637 --------------------- nss/patches/nss-enable-pem.patch0 | 12 - nss/patches/nss-fix-gcc47-secmodt.patch0 | 12 - .../nss-ssl-cbc-random-iv-off-by-default.patch0 | 25 - nss/patches/nsspem-bz754771.patch0 | 13 - .../nsspem-createobject-initialize-pointer.patch0 | 11 - .../nsspem-init-inform-not-thread-safe.patch0 | 129 ----- nss/patches/renegotiate-transitional.patch0 | 12 - nss/secmod.db | Bin 16384 -> 0 bytes nss/setup-nsssysinit.sh | 68 --- nss/system-pkcs11.txt | 5 - 36 files changed, 19 insertions(+), 2521 deletions(-) copy libXdamage/libXdamage.nm => libXcomposite/libXcomposite.nm (85%) delete mode 100644 nspr/nspr-config-vars.in delete mode 100644 nspr/nspr.nm delete mode 100644 nspr/nspr.pc.in delete mode 100644 nspr/patches/nspr-config-pc.patch delete mode 100644 nss/PayPalEE.cert delete mode 100644 nss/cert8.db delete mode 100644 nss/cert9.db delete mode 100644 nss/key3.db delete mode 100644 nss/key4.db delete mode 100644 nss/nss-config.in delete mode 100644 nss/nss-util-config.in delete mode 100644 nss/nss-util.pc.in delete mode 100644 nss/nss.nm delete mode 100644 nss/nss.pc.in delete mode 100644 nss/patches/0001-Bug-695011-PEM-logging.patch delete mode 100644 nss/patches/0001-libnsspem-rhbz-734760.patch delete mode 100644 nss/patches/bz784672-protect-against-calls-before-nss_init.patch0 delete mode 100644 nss/patches/gnuc-minor-def-fix.patch delete mode 100644 nss/patches/nofipstest.patch0 delete mode 100644 nss/patches/nosha224.patch0 delete mode 100644 nss/patches/nss-646045.patch0 delete mode 100644 nss/patches/nss-ckbi-1.88.rtm.patch0 delete mode 100644 nss/patches/nss-enable-pem.patch0 delete mode 100644 nss/patches/nss-fix-gcc47-secmodt.patch0 delete mode 100644 nss/patches/nss-ssl-cbc-random-iv-off-by-default.patch0 delete mode 100644 nss/patches/nsspem-bz754771.patch0 delete mode 100644 nss/patches/nsspem-createobject-initialize-pointer.patch0 delete mode 100644 nss/patches/nsspem-init-inform-not-thread-safe.patch0 delete mode 100644 nss/patches/renegotiate-transitional.patch0 delete mode 100644 nss/secmod.db delete mode 100755 nss/setup-nsssysinit.sh delete mode 100644 nss/system-pkcs11.txt Difference in files: diff --git a/apr-util/apr-util.nm b/apr-util/apr-util.nm index a4632da..7cc97fb 100644 --- a/apr-util/apr-util.nm +++ b/apr-util/apr-util.nm @@ -5,7 +5,7 @@ name = apr-util version = 1.4.1 -release = 2 +release = 3 groups = System/Libraries url = http://apr.apache.org/ @@ -23,11 +23,10 @@ source_dl = http://www.apache.org/dist/apr/ build requires autoconf - db4-devel + libdb-devel expat-devel libapr-devel libuuid-devel - nss-devel openssl-devel end @@ -35,8 +34,7 @@ build --with-apr=/usr \ --with-berkeley-db \ --with-crypto \ - --with-openssl \ - --with-nss + --with-openssl install_cmds # Remove unneeded file. @@ -47,25 +45,22 @@ end packages package %{name} - package %{name}-nss - summary = APR utility library NSS crytpo support. - description = %{summary} - - requires = apr-util=%{thisver} - - files = /usr/lib/apr-util*/apr_crypto_nss* - end - package %{name}-openssl summary = APR utility library OpenSSL crytpo support. description = %{summary} - requires = apr-util=%{thisver} + requires + apr-util = %{thisver} + end - files = /usr/lib/apr-util*/apr_crypto_openssl* + files = %{libdir}/apr-util*/apr_crypto_openssl* end package %{name}-devel template DEVEL end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/curl/curl.nm b/curl/curl.nm index dd48eed..4581431 100644 --- a/curl/curl.nm +++ b/curl/curl.nm @@ -5,7 +5,7 @@ name = curl version = 7.24.0 -release = 3 +release = 4 groups = Application/Internet url = http://www.curl.haxx.se/ @@ -31,7 +31,6 @@ build libssh2-devel libtool-devel net-tools - nss-devel openldap-devel zlib-devel end @@ -42,12 +41,11 @@ build --with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt \ --with-libidn \ --with-libssh2 \ - --with-nss \ + --with-ssl \ --enable-ldaps \ --enable-ipv6 \ --enable-manual \ - --enable-threaded-resolver \ - --without-ssl + --enable-threaded-resolver prepare_cmds autoreconf -vfi diff --git a/glibc/glibc.nm b/glibc/glibc.nm index 1c532fb..3ad812b 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -5,7 +5,7 @@ name = glibc version = 2.17 -release = 2 +release = 3 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Base @@ -38,7 +38,6 @@ build kernel-headers >= %{OPTIMIZED_KERNEL} libcap-devel libselinux-devel - nss-devel texinfo end @@ -95,7 +94,6 @@ build --with-selinux \ --disable-werror \ --enable-bind-now \ - --enable-nss-crypt \ --enable-obsolete-rpc \ --with-bugurl=http://bugtracker.ipfire.org diff --git a/libXcomposite/libXcomposite.nm b/libXcomposite/libXcomposite.nm new file mode 100644 index 0000000..ad9734f --- /dev/null +++ b/libXcomposite/libXcomposite.nm @@ -0,0 +1,44 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = libXcomposite +version = 0.4.4 +release = 1 + +maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> +groups = X/Libraries +url = http://www.x.org/ +license = MIT +summary = X Composite extension library. + +description + X.Org X11 libXcomposite runtime library. +end + +source_dl = http://ftp.x.org/pub/individual/lib/ + +build + requires + libX11-devel + libXfixes-devel + pkg-config + xorg-x11-proto-devel + end + + configure_options += \ + --disable-static +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/nspr/nspr-config-vars.in b/nspr/nspr-config-vars.in deleted file mode 100644 index ebf0aa4..0000000 --- a/nspr/nspr-config-vars.in +++ /dev/null @@ -1,2 +0,0 @@ -ldflags=@LDFLAGS@ -os_libs=@OS_LIBS@ diff --git a/nspr/nspr.nm b/nspr/nspr.nm deleted file mode 100644 index c23b137..0000000 --- a/nspr/nspr.nm +++ /dev/null @@ -1,110 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = nspr -version = 4.8.9 -release = 2 - -groups = System/Libraries -url = http://www.mozilla.org/projects/nspr/ -license = MPLv1.1 or GPLv2+ or LGPLv2+ -summary = Netscape Portable Runtime. - -description - NSPR provides platform independence for non-GUI operating system - facilities. These facilities include threads, thread synchronization, - normal file and network I/O, interval timing and calendar time, basic - memory management (malloc and free) and shared library linking. -end - -source_dl = ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v%{version}/src/ - -build - requires - pkg-config - end - - # Original nspr-config is not suitable for our distribution, - # because on different platforms it contains different dynamic content. - # Therefore we produce an adjusted copy of nspr-config that will be - # identical on all platforms. - # However, we need to use original nspr-config to produce some variables - # that go into nspr.pc for pkg-config. - - prepare - cd %{DIR_SRC} && %{MACRO_EXTRACT} %{DIR_DL}/%{sources} - - cp -vf %{DIR_APP}/mozilla/nsprpub/config/nspr-config.in \ - %{DIR_APP}/mozilla/nsprpub/config/nspr-config-pc.in - cp -vf %{DIR_SOURCE}/nspr-config-vars.in \ - %{DIR_APP}/mozilla/nsprpub/config/ - cd %{DIR_APP} - - %{MACRO_PATCHES} - end - - if "%{DISTRO_ARCH}" == "x86_64" - configure_options += \ - --enable-64bit - end - - if "%{DISTRO_ARCH}" == "armv7hl" - configure_options += \ - --enable-thumb2 - end - - configure_options += \ - --includedir=/usr/include/nspr4 \ - --enable-optimize="%{CFLAGS}" \ - --disable-debug - - build - %{DIR_APP}/mozilla/nsprpub/configure \ - %{configure_options} - - make - end - - install_cmds - mkdir -pv %{BUILDROOT}/usr/{bin,%{lib}} - mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig - - cp -vf %{DIR_APP}/config/nspr-config-pc \ - %{BUILDROOT}/usr/bin/nspr-config - - sed \ - -e "s,%libdir%,%{libdir},g" \ - -e "s,%prefix%,/usr,g" \ - -e "s,%exec_prefix%,/usr,g" \ - -e "s,%includedir%,/usr/include/nspr4,g" \ - -e "s,%NSPR_VERSION%,%{version},g" \ - -e "s,%FULL_NSPR_LIBS%,-L%{libdir} -lnspr4 -lplc4 -lplds4 -ldl -lpthread,g" \ - -e "s,%FULL_NSPR_CFLAGS%,-I/usr/include/nspr4,g" \ - < %{DIR_SOURCE}/nspr.pc.in \ - > %{BUILDROOT}%{libdir}/pkgconfig/nspr.pc - - # Remove unneeded stuff - rm -rfv \ - %{BUILDROOT}/usr/bin/compile-et.pl \ - %{BUILDROOT}/usr/bin/prerr.properties \ - %{BUILDROOT}/usr/share/aclocal/nspr.m4 \ - %{BUILDROOT}/usr/include/nspr4/md - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - - # libs are not versioned. - files += !%{libdir}/*.so - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/nspr/nspr.pc.in b/nspr/nspr.pc.in deleted file mode 100644 index 1d8f4a0..0000000 --- a/nspr/nspr.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSPR -Description: The Netscape Portable Runtime -Version: %NSPR_VERSION% -Libs: %FULL_NSPR_LIBS% -Cflags: %FULL_NSPR_CFLAGS% diff --git a/nspr/patches/nspr-config-pc.patch b/nspr/patches/nspr-config-pc.patch deleted file mode 100644 index 24b1123..0000000 --- a/nspr/patches/nspr-config-pc.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/bmozilla/nsprpub/config/nspr-config-pc.in.x123 2005-05-11 02:53:41.000000000 +0200 -+++ b/mozilla/nsprpub/config/nspr-config-pc.in 2006-05-24 20:52:12.000000000 +0200 -@@ -98,7 +98,7 @@ - includedir=@includedir@ - fi - if test -z "$libdir"; then -- libdir=@libdir@ -+ libdir=`pkg-config --variable=libdir nspr` - fi - - if test "$echo_prefix" = "yes"; then -@@ -132,12 +132,12 @@ - if test -n "$lib_nspr"; then - libdirs="$libdirs -lnspr${major_version}" - fi -- os_ldflags="@LDFLAGS@" -+ os_ldflags=`pkg-config --variable=ldflags nspr` - for i in $os_ldflags ; do - if echo $i | grep \^-L >/dev/null; then - libdirs="$libdirs $i" - fi - done -- echo $libdirs @OS_LIBS@ -+ echo $libdirs `pkg-config --variable=os_libs nspr` - fi - ---- a/mozilla/nsprpub/configure.in.x123 2006-05-24 20:52:12.000000000 +0200 -+++ b/mozilla/nsprpub/configure.in 2006-05-24 20:53:53.000000000 +0200 -@@ -2667,6 +2667,8 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr-config-pc -+config/nspr-config-vars - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile ---- a/mozilla/nsprpub/configure.x123 2006-05-24 20:52:12.000000000 +0200 -+++ b/mozilla/nsprpub/configure 2006-05-24 20:54:05.000000000 +0200 -@@ -5899,6 +5899,8 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr-config-pc -+config/nspr-config-vars - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile diff --git a/nss/PayPalEE.cert b/nss/PayPalEE.cert deleted file mode 100644 index e49d8bd..0000000 Binary files a/nss/PayPalEE.cert and /dev/null differ diff --git a/nss/cert8.db b/nss/cert8.db deleted file mode 100644 index ac40a33..0000000 Binary files a/nss/cert8.db and /dev/null differ diff --git a/nss/cert9.db b/nss/cert9.db deleted file mode 100644 index 1763264..0000000 Binary files a/nss/cert9.db and /dev/null differ diff --git a/nss/key3.db b/nss/key3.db deleted file mode 100644 index 31e3975..0000000 Binary files a/nss/key3.db and /dev/null differ diff --git a/nss/key4.db b/nss/key4.db deleted file mode 100644 index 6bd60cb..0000000 Binary files a/nss/key4.db and /dev/null differ diff --git a/nss/nss-config.in b/nss/nss-config.in deleted file mode 100644 index f8f893e..0000000 --- a/nss/nss-config.in +++ /dev/null @@ -1,145 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ - -major_version=@MOD_MAJOR_VERSION@ -minor_version=@MOD_MINOR_VERSION@ -patch_version=@MOD_PATCH_VERSION@ - -usage() -{ - cat <<EOF -Usage: nss-config [OPTIONS] [LIBRARIES] -Options: - [--prefix[=DIR]] - [--exec-prefix[=DIR]] - [--includedir[=DIR]] - [--libdir[=DIR]] - [--version] - [--libs] - [--cflags] -Dynamic Libraries: - nss - nssutil - ssl - smime -EOF - exit $1 -} - -if test $# -eq 0; then - usage 1 1>&2 -fi - -lib_ssl=yes -lib_smime=yes -lib_nss=yes -lib_nssutil=yes - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --includedir=*) - includedir=$optarg - ;; - --includedir) - echo_includedir=yes - ;; - --libdir=*) - libdir=$optarg - ;; - --libdir) - echo_libdir=yes - ;; - --version) - echo ${major_version}.${minor_version}.${patch_version} - ;; - --cflags) - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - ssl) - lib_ssl=yes - ;; - smime) - lib_smime=yes - ;; - nss) - lib_nss=yes - ;; - nssutil) - lib_nssutil=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -# Set variables that may be dependent upon other variables -if test -z "$exec_prefix"; then - exec_prefix=`pkg-config --variable=exec_prefix nss` -fi -if test -z "$includedir"; then - includedir=`pkg-config --variable=includedir nss` -fi -if test -z "$libdir"; then - libdir=`pkg-config --variable=libdir nss` -fi - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi - -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi - -if test "$echo_includedir" = "yes"; then - echo $includedir -fi - -if test "$echo_libdir" = "yes"; then - echo $libdir -fi - -if test "$echo_cflags" = "yes"; then - echo -I$includedir -fi - -if test "$echo_libs" = "yes"; then - libdirs="-Wl,-rpath-link,$libdir -L$libdir" - if test -n "$lib_ssl"; then - libdirs="$libdirs -lssl${major_version}" - fi - if test -n "$lib_smime"; then - libdirs="$libdirs -lsmime${major_version}" - fi - if test -n "$lib_nss"; then - libdirs="$libdirs -lnss${major_version}" - fi - if test -n "$lib_nssutil"; then - libdirs="$libdirs -lnssutil${major_version}" - fi - echo $libdirs -fi - diff --git a/nss/nss-util-config.in b/nss/nss-util-config.in deleted file mode 100644 index ef8751d..0000000 --- a/nss/nss-util-config.in +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ - -major_version=@MOD_MAJOR_VERSION@ -minor_version=@MOD_MINOR_VERSION@ -patch_version=@MOD_PATCH_VERSION@ - -usage() -{ - cat <<EOF -Usage: nss-util-config [OPTIONS] [LIBRARIES] -Options: - [--prefix[=DIR]] - [--exec-prefix[=DIR]] - [--includedir[=DIR]] - [--libdir[=DIR]] - [--version] - [--libs] - [--cflags] -Dynamic Libraries: - nssutil -EOF - exit $1 -} - -if test $# -eq 0; then - usage 1 1>&2 -fi - -lib_nssutil=yes - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --includedir=*) - includedir=$optarg - ;; - --includedir) - echo_includedir=yes - ;; - --libdir=*) - libdir=$optarg - ;; - --libdir) - echo_libdir=yes - ;; - --version) - echo ${major_version}.${minor_version}.${patch_version} - ;; - --cflags) - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -# Set variables that may be dependent upon other variables -if test -z "$exec_prefix"; then - exec_prefix=`pkg-config --variable=exec_prefix nss-util` -fi -if test -z "$includedir"; then - includedir=`pkg-config --variable=includedir nss-util` -fi -if test -z "$libdir"; then - libdir=`pkg-config --variable=libdir nss-util` -fi - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi - -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi - -if test "$echo_includedir" = "yes"; then - echo $includedir -fi - -if test "$echo_libdir" = "yes"; then - echo $libdir -fi - -if test "$echo_cflags" = "yes"; then - echo -I$includedir -fi - -if test "$echo_libs" = "yes"; then - libdirs="-Wl,-rpath-link,$libdir -L$libdir" - if test -n "$lib_nssutil"; then - libdirs="$libdirs -lnssutil${major_version}" - fi - echo $libdirs -fi - diff --git a/nss/nss-util.pc.in b/nss/nss-util.pc.in deleted file mode 100644 index 1310248..0000000 --- a/nss/nss-util.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSS-UTIL -Description: Network Security Services Utility Library -Version: %NSSUTIL_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -L${libdir} -lnssutil3 -Cflags: -I${includedir} diff --git a/nss/nss.nm b/nss/nss.nm deleted file mode 100644 index af0a2cf..0000000 --- a/nss/nss.nm +++ /dev/null @@ -1,263 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = nss -ver_major = 3 -ver_minor = 13 -ver_patch = 1 -version = %{ver_major}.%{ver_minor}.%{ver_patch} -release = 4 - -maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> -groups = System/Libraries -url = http://www.mozilla.org/projects/security/pki/nss/ -license = MPLv1.1 or GPLv2+ or LGPLv2+ -summary = Network Security Services. - -description - Network Security Services (NSS) is a set of libraries designed to - support cross-platform development of security-enabled client and - server applications. Applications built with NSS can support SSL v2 - and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 - v3 certificates, and other security standards. -end - -sources += \ - %{name}-pem-20100809.tar.bz2 - -source_dl = ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_%{ver_major}_%{ver_mino… - -build - requires - chrpath - nspr-devel - perl - pkg-config - psmisc - sqlite-devel - zlib-devel - end - - ## Define some global environment variables - - export FREEBL_NO_DEPEND=1 - - # Enable compiler optimizations and disable debugging code - export BUILD_OPT=1 - export XCFLAGS=%{CFLAGS} - - # Allow the usage of system libraries. - export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 - export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 - - # Define where to find nspr header files and libraries. - export NSPR_INCLUDE_DIR=/usr/include/nspr4 - export NSPR_LIB_DIR=%{libdir} - - # Disable support for SHA224. - export NO_SHA224_AVAILABLE=1 - - # Use sqlite from system. - export NSS_USE_SYSTEM_SQLITE=1 - - if "%{DISTRO_ARCH}" == "x86_64" - export USE_64=1 - end - - prepare - # Extract tarball. - cd %{DIR_SRC} && %{MACRO_EXTRACT} %{DIR_DL}/%{thisapp}.tar.gz - - # Extract pem tarball into nss directory. - cd %{DIR_APP} && %{MACRO_EXTRACT} %{DIR_DL}/%{name}-pem-20100809.tar.bz2 - - # Apply all patches - %{MACRO_PATCHES} - end - - build - make -C ./mozilla/security/coreconf - make -C ./mozilla/security/dbm - make -C ./mozilla/security/nss - end - - install - # We have to do the complete install stuff self. - - # Create directory layout. - mkdir -pv %{BUILDROOT}/usr/include/nss3 - mkdir -pv %{BUILDROOT}/usr/{bin,%{lib}} - mkdir -pv %{BUILDROOT}%{libdir}/pkgconfig - mkdir -pv %{BUILDROOT}%{libdir}/nss/unsupported-tools - - # Install all libraries. - install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnss3.so \ - %{BUILDROOT}%{libdir} - install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnssckbi.so \ - %{BUILDROOT}%{libdir} - install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnsspem.so \ - %{BUILDROOT}%{libdir} - install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnsssysinit.so \ - %{BUILDROOT}%{libdir} - install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnssutil3.so \ - %{BUILDROOT}%{libdir} - install -p -v -m 755 mozilla/dist/*.OBJ/lib/libsmime3.so \ - %{BUILDROOT}%{libdir} - install -p -v -m 755 mozilla/dist/*.OBJ/lib/libssl3.so \ - %{BUILDROOT}%{libdir} - install -p -v -m 755 mozilla/dist/*.OBJ/lib/libsoftokn3.so \ - %{BUILDROOT}%{libdir} - install -p -v -m 755 mozilla/dist/*.OBJ/lib/libnssdbm3.so \ - %{BUILDROOT}%{libdir} - install -p -v -m 755 mozilla/dist/*.OBJ/lib/libfreebl3.so \ - %{BUILDROOT}/%{libdir} - - # Install the empty NSS db files - mkdir -pv %{BUILDROOT}/etc/pki/nssdb - cp -vf %{DIR_SOURCE}/*.db %{BUILDROOT}/etc/pki/nssdb/ - install -p -v -m 644 %{DIR_SOURCE}/system-pkcs11.txt \ - %{BUILDROOT}/etc/pki/nssdb/pkcs11.txt - - # Copy the binaries we want - install -p -v -m 755 mozilla/dist/*.OBJ/bin/certutil %{BUILDROOT}/usr/bin - install -p -v -m 755 mozilla/dist/*.OBJ/bin/cmsutil %{BUILDROOT}/usr/bin - install -p -v -m 755 mozilla/dist/*.OBJ/bin/crlutil %{BUILDROOT}/usr/bin - install -p -v -m 755 mozilla/dist/*.OBJ/bin/modutil %{BUILDROOT}/usr/bin - install -p -v -m 755 mozilla/dist/*.OBJ/bin/pk12util %{BUILDROOT}/usr/bin - install -p -v -m 755 mozilla/dist/*.OBJ/bin/signtool %{BUILDROOT}/usr/bin - install -p -v -m 755 mozilla/dist/*.OBJ/bin/signver %{BUILDROOT}/usr/bin - install -p -v -m 755 mozilla/dist/*.OBJ/bin/ssltap %{BUILDROOT}/usr/bin - chrpath --delete %{BUILDROOT}/usr/bin/* - - # Copy the binaries we ship as unsupported - install -p -v -m 755 mozilla/dist/*.OBJ/bin/atob %{BUILDROOT}%{libdir}/nss/unsupported-tools - install -p -v -m 755 mozilla/dist/*.OBJ/bin/btoa %{BUILDROOT}%{libdir}/nss/unsupported-tools - install -p -v -m 755 mozilla/dist/*.OBJ/bin/derdump %{BUILDROOT}%{libdir}/nss/unsupported-tools - install -p -v -m 755 mozilla/dist/*.OBJ/bin/ocspclnt %{BUILDROOT}%{libdir}/nss/unsupported-tools - install -p -v -m 755 mozilla/dist/*.OBJ/bin/pp %{BUILDROOT}%{libdir}/nss/unsupported-tools - install -p -v -m 755 mozilla/dist/*.OBJ/bin/selfserv %{BUILDROOT}%{libdir}/nss/unsupported-tools - install -p -v -m 755 mozilla/dist/*.OBJ/bin/shlibsign %{BUILDROOT}%{libdir}/nss/unsupported-tools - install -p -v -m 755 mozilla/dist/*.OBJ/bin/strsclnt %{BUILDROOT}%{libdir}/nss/unsupported-tools - install -p -v -m 755 mozilla/dist/*.OBJ/bin/symkeyutil %{BUILDROOT}%{libdir}/nss/unsupported-tools - install -p -v -m 755 mozilla/dist/*.OBJ/bin/tstclnt %{BUILDROOT}%{libdir}/nss/unsupported-tools - install -p -v -m 755 mozilla/dist/*.OBJ/bin/vfyserv %{BUILDROOT}%{libdir}/nss/unsupported-tools - install -p -v -m 755 mozilla/dist/*.OBJ/bin/vfychain %{BUILDROOT}%{libdir}/nss/unsupported-tools - chrpath --delete %{BUILDROOT}%{libdir}/nss/unsupported-tools/* - - for file in nss-config nss-util-config; do - sed -e "s,@libdir@,%{libdir},g" \ - -e "s,@prefix@,/usr,g" \ - -e "s,@exec_prefix@,/usr,g" \ - -e "s,@includedir@,/usr/include/nss3,g" \ - -e "s,@MOD_MAJOR_VERSION@,$(grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ - -e "s,@MOD_MINOR_VERSION@,$(grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ - -e "s,@MOD_PATCH_VERSION@,$(grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'),g" \ - < %{DIR_SOURCE}/${file}.in \ - > %{BUILDROOT}/usr/bin/${file} - chmod -v 755 %{BUILDROOT}/usr/bin/${file} - done - - install -p -v -m 755 %{DIR_SOURCE}/setup-nsssysinit.sh %{BUILDROOT}/usr/bin - - # Generate file for pkg-config. - for file in nss.pc nss-util.pc; do - sed \ - -e "s,%libdir%,%{libdir},g" \ - -e "s,%prefix%,/usr,g" \ - -e "s,%exec_prefix%,/usr,g" \ - -e "s,%includedir%,/usr/include/nss3,g" \ - -e "s,%NSS_VERSION%,%{version},g" \ - -e "s,%NSPR_VERSION%,$(nspr-config --version),g" \ - < %{DIR_SOURCE}/${file}.in \ - > %{BUILDROOT}%{libdir}/pkgconfig/${file} - done - - # Copy the include files we want - cp -vf mozilla/dist/public/nss/*.h %{BUILDROOT}/usr/include/nss3 - cp -vf mozilla/dist/private/nss/blapi.h %{BUILDROOT}/usr/include/nss3 - chmod -v 644 %{BUILDROOT}/usr/include/nss3/*.h - end -end - -packages - package %{name} - - package %{name}-libs - template LIBS - - requires - nss-softokn=%{thisver} - nss-softokn-freebl=%{thisver} - end - - files - %{libdir}/*.so - end - end - - package %{name}-devel - template DEVEL - - requires - nspr-devel - nss=%{thisver} - end - - provides - nss-util-devel = %{thisver} - end - - # Mozilla does no versioning :( - files - /usr/bin/*-config - /usr/include - %{libdir}/pkgconfig - end - end - - package %{name}-softokn - summary = Network Security Services Softoken Module. - description - Network Security Services Softoken Cryptographic Module. - end - - requires = nss=%{thisver} - - files - %{libdir}/libnssdbm3.so - %{libdir}/libsoftokn3.so - %{libdir}/nss/unsupported-tools/shlibsign - end - end - - package %{name}-softokn-freebl - summary = Freebl library for the Network Security Services. - description - NSS Softoken Cryptographic Module Freelb Library. - end - - requires - nss=%{thisver} - nss-softokn=%{thisver} - end - - files = %{libdir}/libfreebl3.so - end - - package %{name}-util - summary = Network Security Services Utilities Library. - description - Utilities for Network Security Services and the Softoken module. - end - - requires = nss=%{thisver} - - files = %{libdir}/libnssutil3.so - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/nss/nss.pc.in b/nss/nss.pc.in deleted file mode 100644 index dddf868..0000000 --- a/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -lssl3 -lsmime3 -lnss3 -Cflags: -I${includedir} diff --git a/nss/patches/0001-Bug-695011-PEM-logging.patch b/nss/patches/0001-Bug-695011-PEM-logging.patch deleted file mode 100644 index 2693d7c..0000000 --- a/nss/patches/0001-Bug-695011-PEM-logging.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 5c61cdba435096ee6e65cee4dc9a473430643c07 Mon Sep 17 00:00:00 2001 -From: Elio Maldonado <emaldona(a)redhat.com> -Date: Tue, 12 Apr 2011 09:31:48 -0700 -Subject: [PATCH] Bug 695011 PEM logging - -Use NSPR logging facilities for PEM logging to fix a segmenation violation -caused when user cannot for write a log file created by root ---- - mozilla/security/nss/lib/ckfw/pem/ckpem.h | 7 ++++- - mozilla/security/nss/lib/ckfw/pem/util.c | 30 ++++++++++++++++------------ - 2 files changed, 22 insertions(+), 15 deletions(-) - -diff --git a/mozilla/security/nss/lib/ckfw/pem/ckpem.h b/mozilla/security/nss/lib/ckfw/pem/ckpem.h -index 839d40b..720525e 100644 ---- a/mozilla/security/nss/lib/ckfw/pem/ckpem.h -+++ b/mozilla/security/nss/lib/ckfw/pem/ckpem.h -@@ -1,3 +1,6 @@ -+#ifndef CKPEM_H -+#define CKPEM_H -+ - #include "nssckmdt.h" - #include "nssckfw.h" - #include "ckfwtm.h" -@@ -254,8 +257,8 @@ unsigned int pem_PrivateModulusLen(pemLOWKEYPrivateKey *privk); - /* ptoken.c */ - NSSCKMDToken * pem_NewToken(NSSCKFWInstance *fwInstance, CK_RV *pError); - -+/* util.c */ - void open_log(); --void close_log(); - void plog(const char *fmt, ...); - --#define PEM_H 1 -+#endif /* CKPEM_H */ -diff --git a/mozilla/security/nss/lib/ckfw/pem/util.c b/mozilla/security/nss/lib/ckfw/pem/util.c -index 853f418..fafb924 100644 ---- a/mozilla/security/nss/lib/ckfw/pem/util.c -+++ b/mozilla/security/nss/lib/ckfw/pem/util.c -@@ -41,6 +41,7 @@ - #include "prtime.h" - #include "prlong.h" - #include "prerror.h" -+#include "prlog.h" - #include "prprf.h" - #include "plgetopt.h" - #include "prenv.h" -@@ -51,6 +52,9 @@ - #include "cryptohi.h" - #include "secpkcs7.h" - #include "secerr.h" -+ -+#include "ckpem.h" -+ - #include <stdarg.h> - - #define CHUNK_SIZE 512 -@@ -267,34 +271,34 @@ ReadDERFromFile(SECItem *** derlist, char *filename, PRBool ascii, - return -1; - } - --FILE *plogfile; -+#ifdef DEBUG -+#define LOGGING_BUFFER_SIZE 400 -+#define PEM_DEFAULT_LOG_FILE "/tmp/pkcs11.log" -+static const char *pemLogModuleName = "PEM"; -+static PRLogModuleInfo* pemLogModule; -+#endif - - void open_log() - { - #ifdef DEBUG -- plogfile = fopen("/tmp/pkcs11.log", "a"); --#endif -+ const char *nsprLogFile = PR_GetEnv("NSPR_LOG_FILE"); - -- return; --} -+ pemLogModule = PR_NewLogModule(pemLogModuleName); - --void close_log() --{ --#ifdef DEBUG -- fclose(plogfile); -+ (void) PR_SetLogFile(nsprLogFile ? nsprLogFile : PEM_DEFAULT_LOG_FILE); -+ /* If false, the log file will remain what it was before */ - #endif -- return; - } - - void plog(const char *fmt, ...) - { - #ifdef DEBUG -+ char buf[LOGGING_BUFFER_SIZE]; - va_list ap; - - va_start(ap, fmt); -- vfprintf(plogfile, fmt, ap); -+ PR_vsnprintf(buf, sizeof(buf), fmt, ap); - va_end(ap); -- -- fflush(plogfile); -+ PR_LOG(pemLogModule, PR_LOG_DEBUG, ("%s", buf)); - #endif - } --- -1.7.4.2 - diff --git a/nss/patches/0001-libnsspem-rhbz-734760.patch b/nss/patches/0001-libnsspem-rhbz-734760.patch deleted file mode 100644 index 45b4024..0000000 --- a/nss/patches/0001-libnsspem-rhbz-734760.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up ./mozilla/security/nss/lib/ckfw/pem/pobject.c.734760 ./mozilla/security/nss/lib/ckfw/pem/pobject.c ---- ./mozilla/security/nss/lib/ckfw/pem/pobject.c.734760 2011-09-10 10:21:38.819248564 -0700 -+++ ./mozilla/security/nss/lib/ckfw/pem/pobject.c 2011-09-10 10:28:47.970083785 -0700 -@@ -1117,7 +1117,7 @@ pem_CreateObject - - nobjs = ReadDERFromFile(&derlist, filename, PR_TRUE, &cipher, &ivstring, PR_TRUE /* certs only */); - if (nobjs < 1) -- return (NSSCKMDObject *) NULL; -+ goto loser; - - objid = -1; - /* Brute force: find the id of the key, if any, in this slot */ -@@ -1176,7 +1176,7 @@ pem_CreateObject - - nobjs = ReadDERFromFile(&derlist, filename, PR_TRUE, &cipher, &ivstring, PR_FALSE /* keys only */); - if (nobjs < 1) -- return (NSSCKMDObject *) NULL; -+ goto loser; - - certDER.len = 0; /* in case there is no equivalent cert */ - certDER.data = NULL; diff --git a/nss/patches/bz784672-protect-against-calls-before-nss_init.patch0 b/nss/patches/bz784672-protect-against-calls-before-nss_init.patch0 deleted file mode 100644 index 934ea30..0000000 --- a/nss/patches/bz784672-protect-against-calls-before-nss_init.patch0 +++ /dev/null @@ -1,40 +0,0 @@ -diff -up mozilla/security/nss/lib/nss/nssinit.c.784672 mozilla/security/nss/lib/nss/nssinit.c ---- mozilla/security/nss/lib/nss/nssinit.c.784672 2012-01-26 14:43:46.232357231 -0800 -+++ mozilla/security/nss/lib/nss/nssinit.c 2012-01-26 14:50:55.830512565 -0800 -@@ -944,6 +944,12 @@ NSS_RegisterShutdown(NSS_ShutdownFunc sF - { - int i; - -+ /* make sure our lock and condition variable are initialized one and only -+ * one time */ -+ if (PR_CallOnce(&nssInitOnce, nss_doLockInit) != PR_SUCCESS) { -+ return SECFailure; -+ } -+ - PZ_Lock(nssInitLock); - if (!NSS_IsInitialized()) { - PZ_Unlock(nssInitLock); -@@ -1002,6 +1008,11 @@ NSS_UnregisterShutdown(NSS_ShutdownFunc - { - int i; - -+ /* make sure our lock and condition variable are initialized one and only -+ * one time */ -+ if (PR_CallOnce(&nssInitOnce, nss_doLockInit) != PR_SUCCESS) { -+ return SECFailure; -+ } - PZ_Lock(nssInitLock); - if (!NSS_IsInitialized()) { - PZ_Unlock(nssInitLock); -@@ -1192,6 +1203,11 @@ NSS_ShutdownContext(NSSInitContext *cont - { - SECStatus rv = SECSuccess; - -+ /* make sure our lock and condition variable are initialized one and only -+ * one time */ -+ if (PR_CallOnce(&nssInitOnce, nss_doLockInit) != PR_SUCCESS) { -+ return SECFailure; -+ } - PZ_Lock(nssInitLock); - /* If one or more threads are in the middle of init, wait for them - * to complete */ diff --git a/nss/patches/gnuc-minor-def-fix.patch b/nss/patches/gnuc-minor-def-fix.patch deleted file mode 100644 index f210af2..0000000 --- a/nss/patches/gnuc-minor-def-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h.fo nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h ---- nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h.fo 2011-11-10 12:44:17.683967574 -0600 -+++ nss-3.13.1/mozilla/security/nss/lib/util/pkcs11n.h 2011-11-10 12:44:24.146886778 -0600 -@@ -362,7 +362,7 @@ typedef CK_ULONG CK_TRUST; - * cast the resulting value to the deprecated type in the #define, thus - * producting the warning when the #define is used. - */ --#if (__GNUC__ == 4) && (__GNUC_MINOR < 5) -+#if (__GNUC__ == 4) && (__GNUC_MINOR__ < 5) - /* The mac doesn't like the friendlier deprecate messages. I'm assuming this - * is a gcc version issue rather than mac or ppc specific */ - typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated)); diff --git a/nss/patches/nofipstest.patch0 b/nss/patches/nofipstest.patch0 deleted file mode 100644 index 5f711be..0000000 --- a/nss/patches/nofipstest.patch0 +++ /dev/null @@ -1,19 +0,0 @@ -diff -up ./mozilla/security/nss/cmd/manifest.mn.nofipstest ./mozilla/security/nss/cmd/manifest.mn ---- ./mozilla/security/nss/cmd/manifest.mn.nofipstest 2011-12-03 22:54:40.969914919 -0800 -+++ ./mozilla/security/nss/cmd/manifest.mn 2011-12-03 22:55:12.348505822 -0800 -@@ -54,7 +54,6 @@ DIRS = lib \ - dbtest \ - derdump \ - digest \ -- fipstest \ - makepqg \ - multinit \ - ocspclnt \ -@@ -84,6 +83,7 @@ DIRS = lib \ - $(NULL) - - TEMPORARILY_DONT_BUILD = \ -+ fipstest \ - $(NULL) - - # rsaperf \ diff --git a/nss/patches/nosha224.patch0 b/nss/patches/nosha224.patch0 deleted file mode 100644 index bd9d351..0000000 --- a/nss/patches/nosha224.patch0 +++ /dev/null @@ -1,618 +0,0 @@ -diff -up ./mozilla/security/coreconf/Linux.mk.nosha224 ./mozilla/security/coreconf/Linux.mk ---- ./mozilla/security/coreconf/Linux.mk.nosha224 2011-12-04 22:03:47.295609957 -0800 -+++ ./mozilla/security/coreconf/Linux.mk 2011-12-04 22:03:47.301609957 -0800 -@@ -188,6 +188,14 @@ NSSUTIL_LIBS = -lnssutil3 - USE_SYSTEM_FREEBL = 1 - FREEBL_LIBS = -lfreebl3 - -+# -+# Don't compile code that requires SHA224 if it isn't avilable -+# Such is the case when system freebl/softokn is the 3.12 one -+# -+ifdef NO_SHA224_AVAILABLE -+CFLAGS+=-DNO_SHA224_AVAILABLE -+endif -+ - # The -rpath '$$ORIGIN' linker option instructs this library to search for its - # dependencies in the same directory where it resides. - ifeq ($(BUILD_SUN_PKG), 1) -diff -up ./mozilla/security/nss/cmd/bltest/blapitest.c.nosha224 ./mozilla/security/nss/cmd/bltest/blapitest.c ---- ./mozilla/security/nss/cmd/bltest/blapitest.c.nosha224 2011-09-16 12:16:50.000000000 -0700 -+++ ./mozilla/security/nss/cmd/bltest/blapitest.c 2011-12-04 22:03:47.302609957 -0800 -@@ -686,7 +686,9 @@ typedef enum { - bltestMD2, /* Hash algorithms */ - bltestMD5, /* . */ - bltestSHA1, /* . */ -+#ifndef NO_SHA224_AVAILABLE - bltestSHA224, /* . */ -+#endif - bltestSHA256, /* . */ - bltestSHA384, /* . */ - bltestSHA512, /* . */ -@@ -721,7 +723,9 @@ static char *mode_strings[] = - "md2", - "md5", - "sha1", -+#ifndef NO_SHA224_AVAILABLE - "sha224", -+#endif - "sha256", - "sha384", - "sha512", -@@ -1761,6 +1765,7 @@ finish: - return rv; - } - -+#ifndef NO_SHA224_AVAILABLE - SECStatus - SHA224_restart(unsigned char *dest, const unsigned char *src, uint32 src_length) - { -@@ -1800,6 +1805,7 @@ finish: - SHA224_DestroyContext(cx, PR_TRUE); - return rv; - } -+#endif - - SECStatus - SHA256_restart(unsigned char *dest, const unsigned char *src, uint32 src_length) -@@ -2093,6 +2099,7 @@ cipherInit(bltestCipherInfo *cipherInfo, - cipherInfo->cipher.hashCipher = (restart) ? sha1_restart : SHA1_HashBuf; - return SECSuccess; - break; -+#ifndef NO_SHA224_AVAILABLE - case bltestSHA224: - restart = cipherInfo->params.hash.restart; - SECITEM_AllocItem(cipherInfo->arena, &cipherInfo->output.buf, -@@ -2100,6 +2107,7 @@ cipherInit(bltestCipherInfo *cipherInfo, - cipherInfo->cipher.hashCipher = (restart) ? SHA224_restart - : SHA224_HashBuf; - return SECSuccess; -+#endif - break; - case bltestSHA256: - restart = cipherInfo->params.hash.restart; -@@ -2542,7 +2550,9 @@ cipherFinish(bltestCipherInfo *cipherInf - case bltestMD2: /* hash contexts are ephemeral */ - case bltestMD5: - case bltestSHA1: -+#ifndef NO_SHA224_AVAILABLE - case bltestSHA224: -+#endif - case bltestSHA256: - case bltestSHA384: - case bltestSHA512: -@@ -2896,7 +2906,9 @@ get_params(PRArenaPool *arena, bltestPar - case bltestMD2: - case bltestMD5: - case bltestSHA1: -+#ifndef NO_SHA224_AVAILABLE - case bltestSHA224: -+#endif - case bltestSHA256: - case bltestSHA384: - case bltestSHA512: -diff -up ./mozilla/security/nss/cmd/chktest/chktest.c.nosha224 ./mozilla/security/nss/cmd/chktest/chktest.c ---- ./mozilla/security/nss/cmd/chktest/chktest.c.nosha224 2010-12-06 09:22:49.000000000 -0800 -+++ ./mozilla/security/nss/cmd/chktest/chktest.c 2011-12-04 22:03:47.304609957 -0800 -@@ -41,6 +41,10 @@ - #include "blapi.h" - #include "secutil.h" - -+#ifdef NO_SHA224_AVAILABLE -+PRBool BLAPI_SHVerifyFile(const char *shName); -+#endif -+ - static int Usage() - { - fprintf(stderr, "Usage: chktest <full-path-to-shared-library>\n"); -diff -up ./mozilla/security/nss/cmd/lib/secutil.c.nosha224 ./mozilla/security/nss/cmd/lib/secutil.c ---- ./mozilla/security/nss/cmd/lib/secutil.c.nosha224 2011-10-22 07:35:41.000000000 -0700 -+++ ./mozilla/security/nss/cmd/lib/secutil.c 2011-12-04 22:03:47.305609957 -0800 -@@ -86,6 +86,14 @@ static char consoleName[] = { - #include "nssutil.h" - #include "ssl.h" - -+/* Defined in ./mozilla/dist/public/nss/certdb.h which was included -+ * and also in ./mozilla/security/nss/lib/softoken/legacydb/pcertt.h -+ * but invisible here for some reason -+ */ -+#ifndef CERTDB_TERMINAL_RECORD -+#define CERTDB_TERMINAL_RECORD (1<<0) -+#endif -+ - - void - SECU_PrintErrMsg(FILE *out, int level, char *progName, char *msg, ...) -@@ -1509,6 +1517,8 @@ const SEC_ASN1Template secuPBEV2Params[] - { 0 } - }; - -+/* if no sha224 then no psapss either */ -+#ifndef NO_SHA224_AVAILABLE - void - secu_PrintRSAPSSParams(FILE *out, SECItem *value, char *m, int level) - { -@@ -1572,6 +1582,7 @@ secu_PrintRSAPSSParams(FILE *out, SECIte - } - PORT_FreeArena(pool, PR_FALSE); - } -+#endif - - void - secu_PrintKDF2Params(FILE *out, SECItem *value, char *m, int level) -@@ -1684,10 +1695,12 @@ SECU_PrintAlgorithmID(FILE *out, SECAlgo - return; - } - -+#ifndef NO_SHA224_AVAILABLE - if (algtag == SEC_OID_PKCS1_RSA_PSS_SIGNATURE) { - secu_PrintRSAPSSParams(out, &a->parameters, "Parameters", level+1); - return; - } -+#endif - - if (a->parameters.len == 0 - || (a->parameters.len == 2 -@@ -3763,8 +3776,10 @@ SECU_StringToSignatureAlgTag(const char - hashAlgTag = SEC_OID_MD5; - } else if (!PL_strcmp(alg, "SHA1")) { - hashAlgTag = SEC_OID_SHA1; -+#ifndef NO_SHA224_AVAILABLE - } else if (!PL_strcmp(alg, "SHA224")) { - hashAlgTag = SEC_OID_SHA224; -+#endif - } else if (!PL_strcmp(alg, "SHA256")) { - hashAlgTag = SEC_OID_SHA256; - } else if (!PL_strcmp(alg, "SHA384")) { -diff -up ./mozilla/security/nss/cmd/pk11mode/pk11mode.c.nosha224 ./mozilla/security/nss/cmd/pk11mode/pk11mode.c ---- ./mozilla/security/nss/cmd/pk11mode/pk11mode.c.nosha224 2011-12-04 22:07:27.230604899 -0800 -+++ ./mozilla/security/nss/cmd/pk11mode/pk11mode.c 2011-12-04 22:10:06.365601241 -0800 -@@ -883,21 +883,27 @@ CK_RV PKM_KeyTests(CK_FUNCTION_LIST_PTR - - mech_str digestMechs[] = { - {CKM_SHA_1, "CKM_SHA_1 "}, -+#ifndef NO_SHA224_AVAILABLE - {CKM_SHA224, "CKM_SHA224"}, -+#endif - {CKM_SHA256, "CKM_SHA256"}, - {CKM_SHA384, "CKM_SHA384"}, - {CKM_SHA512, "CKM_SHA512"} - }; - mech_str hmacMechs[] = { - {CKM_SHA_1_HMAC, "CKM_SHA_1_HMAC"}, -+#ifndef NO_SHA224_AVAILABLE - {CKM_SHA224_HMAC, "CKM_SHA224_HMAC"}, -+#endif - {CKM_SHA256_HMAC, "CKM_SHA256_HMAC"}, - {CKM_SHA384_HMAC, "CKM_SHA384_HMAC"}, - {CKM_SHA512_HMAC, "CKM_SHA512_HMAC"} - }; - mech_str sigRSAMechs[] = { - {CKM_SHA1_RSA_PKCS, "CKM_SHA1_RSA_PKCS"}, -+#ifndef NO_SHA224_AVAILABLE - {CKM_SHA224_RSA_PKCS, "CKM_SHA224_RSA_PKCS"}, -+#endif - {CKM_SHA256_RSA_PKCS, "CKM_SHA256_RSA_PKCS"}, - {CKM_SHA384_RSA_PKCS, "CKM_SHA384_RSA_PKCS"}, - {CKM_SHA512_RSA_PKCS, "CKM_SHA512_RSA_PKCS"} -diff -up ./mozilla/security/nss/lib/cryptohi/sechash.c.nosha224 ./mozilla/security/nss/lib/cryptohi/sechash.c ---- ./mozilla/security/nss/lib/cryptohi/sechash.c.nosha224 2011-06-21 15:47:54.000000000 -0700 -+++ ./mozilla/security/nss/lib/cryptohi/sechash.c 2011-12-04 22:03:47.306609957 -0800 -@@ -91,10 +91,12 @@ sha1_NewContext(void) { - return (void *) PK11_CreateDigestContext(SEC_OID_SHA1); - } - -+#ifndef NO_SHA224_AVAILABLE - static void * - sha224_NewContext(void) { - return (void *) PK11_CreateDigestContext(SEC_OID_SHA224); - } -+#endif - - static void * - sha256_NewContext(void) { -@@ -189,6 +191,7 @@ const SECHashObject SECHashObjects[] = { - SHA512_BLOCK_LENGTH, - HASH_AlgSHA512 - }, -+#ifndef NO_SHA224_AVAILABLE - { SHA224_LENGTH, - (void * (*)(void)) sha224_NewContext, - (void * (*)(void *)) PK11_CloneContext, -@@ -200,6 +203,7 @@ const SECHashObject SECHashObjects[] = { - SHA224_BLOCK_LENGTH, - HASH_AlgSHA224 - }, -+#endif - }; - - const SECHashObject * -@@ -217,7 +221,9 @@ HASH_GetHashTypeByOidTag(SECOidTag hashO - case SEC_OID_MD2: ht = HASH_AlgMD2; break; - case SEC_OID_MD5: ht = HASH_AlgMD5; break; - case SEC_OID_SHA1: ht = HASH_AlgSHA1; break; -+#ifndef NO_SHA224_AVAILABLE - case SEC_OID_SHA224: ht = HASH_AlgSHA224; break; -+#endif - case SEC_OID_SHA256: ht = HASH_AlgSHA256; break; - case SEC_OID_SHA384: ht = HASH_AlgSHA384; break; - case SEC_OID_SHA512: ht = HASH_AlgSHA512; break; -@@ -237,7 +243,9 @@ HASH_GetHashOidTagByHMACOidTag(SECOidTag - /* no oid exists for HMAC_MD2 */ - /* NSS does not define a oid for HMAC_MD4 */ - case SEC_OID_HMAC_SHA1: hashOid = SEC_OID_SHA1; break; -+#ifndef NO_SHA224_AVAILABLE - case SEC_OID_HMAC_SHA224: hashOid = SEC_OID_SHA224; break; -+#endif - case SEC_OID_HMAC_SHA256: hashOid = SEC_OID_SHA256; break; - case SEC_OID_HMAC_SHA384: hashOid = SEC_OID_SHA384; break; - case SEC_OID_HMAC_SHA512: hashOid = SEC_OID_SHA512; break; -@@ -257,7 +265,9 @@ HASH_GetHMACOidTagByHashOidTag(SECOidTag - /* no oid exists for HMAC_MD2 */ - /* NSS does not define a oid for HMAC_MD4 */ - case SEC_OID_SHA1: hmacOid = SEC_OID_HMAC_SHA1; break; -+#ifndef NO_SHA224_AVAILABLE - case SEC_OID_SHA224: hmacOid = SEC_OID_HMAC_SHA224; break; -+#endif - case SEC_OID_SHA256: hmacOid = SEC_OID_HMAC_SHA256; break; - case SEC_OID_SHA384: hmacOid = SEC_OID_HMAC_SHA384; break; - case SEC_OID_SHA512: hmacOid = SEC_OID_HMAC_SHA512; break; -diff -up ./mozilla/security/nss/lib/cryptohi/seckey.c.nosha224 ./mozilla/security/nss/lib/cryptohi/seckey.c ---- ./mozilla/security/nss/lib/cryptohi/seckey.c.nosha224 2011-10-22 07:35:42.000000000 -0700 -+++ ./mozilla/security/nss/lib/cryptohi/seckey.c 2011-12-04 22:03:47.307609957 -0800 -@@ -550,7 +550,9 @@ seckey_GetKeyType (SECOidTag tag) { - * should be handing us a cipher type */ - case SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION: - case SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION: -+#ifndef NO_SHA224_AVAILABLE - case SEC_OID_PKCS1_SHA224_WITH_RSA_ENCRYPTION: -+#endif - case SEC_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION: - case SEC_OID_PKCS1_SHA384_WITH_RSA_ENCRYPTION: - case SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION: -diff -up ./mozilla/security/nss/lib/cryptohi/secvfy.c.nosha224 ./mozilla/security/nss/lib/cryptohi/secvfy.c ---- ./mozilla/security/nss/lib/cryptohi/secvfy.c.nosha224 2011-10-22 07:35:42.000000000 -0700 -+++ ./mozilla/security/nss/lib/cryptohi/secvfy.c 2011-12-04 22:03:47.307609957 -0800 -@@ -240,11 +240,12 @@ sec_DecodeSigAlg(const SECKEYPublicKey * - case SEC_OID_PKCS1_RSA_PSS_SIGNATURE: - *hashalg = SEC_OID_UNKNOWN; /* get it from the RSA signature */ - break; -- -+#ifndef NO_SHA224_AVAILABLE - case SEC_OID_ANSIX962_ECDSA_SHA224_SIGNATURE: - case SEC_OID_PKCS1_SHA224_WITH_RSA_ENCRYPTION: - *hashalg = SEC_OID_SHA224; - break; -+#endif - case SEC_OID_ANSIX962_ECDSA_SHA256_SIGNATURE: - case SEC_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION: - *hashalg = SEC_OID_SHA256; -@@ -279,8 +280,10 @@ sec_DecodeSigAlg(const SECKEYPublicKey * - len = SECKEY_PublicKeyStrength(key); - if (len < 28) { /* 28 bytes == 224 bits */ - *hashalg = SEC_OID_SHA1; -+#ifndef NO_SHA224_AVAILABLE - } else if (len < 32) { /* 32 bytes == 256 bits */ - *hashalg = SEC_OID_SHA224; -+#endif - } else if (len < 48) { /* 48 bytes == 384 bits */ - *hashalg = SEC_OID_SHA256; - } else if (len < 64) { /* 48 bytes == 512 bits */ -@@ -325,7 +328,9 @@ sec_DecodeSigAlg(const SECKEYPublicKey * - case SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION: - case SEC_OID_ISO_SHA_WITH_RSA_SIGNATURE: - case SEC_OID_ISO_SHA1_WITH_RSA_SIGNATURE: -+#ifndef NO_SHA224_AVAILABLE - case SEC_OID_PKCS1_SHA224_WITH_RSA_ENCRYPTION: -+#endif - case SEC_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION: - case SEC_OID_PKCS1_SHA384_WITH_RSA_ENCRYPTION: - case SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION: -@@ -347,7 +352,9 @@ sec_DecodeSigAlg(const SECKEYPublicKey * - *encalg = SEC_OID_MISSI_DSS; - break; - case SEC_OID_ANSIX962_ECDSA_SHA1_SIGNATURE: -+#ifndef NO_SHA224_AVAILABLE - case SEC_OID_ANSIX962_ECDSA_SHA224_SIGNATURE: -+#endif - case SEC_OID_ANSIX962_ECDSA_SHA256_SIGNATURE: - case SEC_OID_ANSIX962_ECDSA_SHA384_SIGNATURE: - case SEC_OID_ANSIX962_ECDSA_SHA512_SIGNATURE: -diff -up ./mozilla/security/nss/lib/freebl/blapi.h.nosha224 ./mozilla/security/nss/lib/freebl/blapi.h ---- ./mozilla/security/nss/lib/freebl/blapi.h.nosha224 2011-10-04 15:05:53.000000000 -0700 -+++ ./mozilla/security/nss/lib/freebl/blapi.h 2011-12-04 22:03:47.308609957 -0800 -@@ -1088,7 +1088,7 @@ extern SHA1Context * SHA1_Resurrect(unsi - extern void SHA1_Clone(SHA1Context *dest, SHA1Context *src); - - /******************************************/ -- -+#ifndef NO_SHA224_AVAILABLE - extern SHA224Context *SHA224_NewContext(void); - extern void SHA224_DestroyContext(SHA224Context *cx, PRBool freeit); - extern void SHA224_Begin(SHA224Context *cx); -@@ -1104,6 +1104,7 @@ extern unsigned int SHA224_FlattenSize(S - extern SECStatus SHA224_Flatten(SHA224Context *cx,unsigned char *space); - extern SHA224Context * SHA224_Resurrect(unsigned char *space, void *arg); - extern void SHA224_Clone(SHA224Context *dest, SHA224Context *src); -+#endif - - /******************************************/ - -diff -up ./mozilla/security/nss/lib/freebl/ldvector.c.nosha224 ./mozilla/security/nss/lib/freebl/ldvector.c ---- ./mozilla/security/nss/lib/freebl/ldvector.c.nosha224 2011-10-04 15:05:53.000000000 -0700 -+++ ./mozilla/security/nss/lib/freebl/ldvector.c 2011-12-04 22:03:47.309609957 -0800 -@@ -270,7 +270,7 @@ static const struct FREEBLVectorStr vect - JPAKE_Verify, - JPAKE_Round2, - JPAKE_Final, -- -+#ifndef NO_SHA224_AVAILABLE - /* End of Version 3.012 */ - - TLS_P_hash, -@@ -287,7 +287,7 @@ static const struct FREEBLVectorStr vect - SHA224_Resurrect, - SHA224_Clone, - BLAPI_SHVerifyFile -- -+#endif - /* End of Version 3.013 */ - }; - -diff -up ./mozilla/security/nss/lib/freebl/nsslowhash.c.nosha224 ./mozilla/security/nss/lib/freebl/nsslowhash.c ---- ./mozilla/security/nss/lib/freebl/nsslowhash.c.nosha224 2010-09-09 17:42:36.000000000 -0700 -+++ ./mozilla/security/nss/lib/freebl/nsslowhash.c 2011-12-04 22:03:47.309609957 -0800 -@@ -128,14 +128,14 @@ freebl_fips_SHA_PowerUpSelfTest( void ) - 0x0a,0x6d,0x07,0xba,0x1e,0xbd,0x8a,0x1b, - 0x72,0xf6,0xc7,0x22,0xf1,0x27,0x9f,0xf0, - 0xe0,0x68,0x47,0x7a}; -- -+#ifndef NO_SHA224_AVAILABLE - /* SHA-224 Known Digest Message (224-bits). */ - static const PRUint8 sha224_known_digest[] = { - 0x1c,0xc3,0x06,0x8e,0xce,0x37,0x68,0xfb, - 0x1a,0x82,0x4a,0xbe,0x2b,0x00,0x51,0xf8, - 0x9d,0xb6,0xe0,0x90,0x0d,0x00,0xc9,0x64, - 0x9a,0xb8,0x98,0x4e}; -- -+#endif - /* SHA-256 Known Digest Message (256-bits). */ - static const PRUint8 sha256_known_digest[] = { - 0x38,0xa9,0xc1,0xf0,0x35,0xf6,0x5d,0x61, -@@ -178,7 +178,7 @@ freebl_fips_SHA_PowerUpSelfTest( void ) - ( PORT_Memcmp( sha_computed_digest, sha1_known_digest, - SHA1_LENGTH ) != 0 ) ) - return( CKR_DEVICE_ERROR ); -- -+#ifndef NO_SHA224_AVAILABLE - /***************************************************/ - /* SHA-224 Single-Round Known Answer Hashing Test. */ - /***************************************************/ -@@ -190,7 +190,7 @@ freebl_fips_SHA_PowerUpSelfTest( void ) - ( PORT_Memcmp( sha_computed_digest, sha224_known_digest, - SHA224_LENGTH ) != 0 ) ) - return( CKR_DEVICE_ERROR ); -- -+#endif - /***************************************************/ - /* SHA-256 Single-Round Known Answer Hashing Test. */ - /***************************************************/ -diff -up ./mozilla/security/nss/lib/freebl/rawhash.c.nosha224 ./mozilla/security/nss/lib/freebl/rawhash.c ---- ./mozilla/security/nss/lib/freebl/rawhash.c.nosha224 2010-08-17 22:55:47.000000000 -0700 -+++ ./mozilla/security/nss/lib/freebl/rawhash.c 2011-12-04 22:03:47.309609957 -0800 -@@ -155,6 +155,7 @@ const SECHashObject SECRawHashObjects[] - SHA512_BLOCK_LENGTH, - HASH_AlgSHA512 - }, -+#ifndef NO_SHA224_AVAILABLE - { SHA224_LENGTH, - (void * (*)(void)) SHA224_NewContext, - (void * (*)(void *)) null_hash_clone_context, -@@ -166,6 +167,7 @@ const SECHashObject SECRawHashObjects[] - SHA224_BLOCK_LENGTH, - HASH_AlgSHA224 - }, -+#endif - }; - - const SECHashObject * -diff -up ./mozilla/security/nss/lib/freebl/sha512.c.nosha224 ./mozilla/security/nss/lib/freebl/sha512.c ---- ./mozilla/security/nss/lib/freebl/sha512.c.nosha224 2011-09-14 10:48:03.000000000 -0700 -+++ ./mozilla/security/nss/lib/freebl/sha512.c 2011-12-04 22:03:47.310609957 -0800 -@@ -544,6 +544,7 @@ void SHA256_Clone(SHA256Context *dest, S - memcpy(dest, src, sizeof *dest); - } - -+#ifndef NO_SHA224_AVAILABLE - /* ============= SHA224 implementation ================================== */ - - /* SHA-224 initial hash values */ -@@ -630,7 +631,7 @@ void SHA224_Clone(SHA224Context *dest, S - { - SHA256_Clone(dest, src); - } -- -+#endif - - /* ======= SHA512 and SHA384 common constants and defines ================= */ - -diff -up ./mozilla/security/nss/lib/softoken/fipstest.c.nosha224 ./mozilla/security/nss/lib/softoken/fipstest.c ---- ./mozilla/security/nss/lib/softoken/fipstest.c.nosha224 2011-03-29 08:12:43.000000000 -0700 -+++ ./mozilla/security/nss/lib/softoken/fipstest.c 2011-12-04 22:03:47.311609956 -0800 -@@ -865,12 +865,14 @@ sftk_fips_HMAC_PowerUpSelfTest( void ) - 0x3b, 0x57, 0x1d, 0x61, 0xe7, 0xb8, 0x84, 0x1e, - 0x5d, 0x0e, 0x1e, 0x11}; - -+#ifndef NO_SHA224_AVAILABLE - /* known SHA224 hmac (28 bytes) */ - static const PRUint8 known_SHA224_hmac[] = { - 0x1c, 0xc3, 0x06, 0x8e, 0xce, 0x37, 0x68, 0xfb, - 0x1a, 0x82, 0x4a, 0xbe, 0x2b, 0x00, 0x51, 0xf8, - 0x9d, 0xb6, 0xe0, 0x90, 0x0d, 0x00, 0xc9, 0x64, - 0x9a, 0xb8, 0x98, 0x4e}; -+#endif - - /* known SHA256 hmac (32 bytes) */ - static const PRUint8 known_SHA256_hmac[] = { -@@ -922,6 +924,7 @@ sftk_fips_HMAC_PowerUpSelfTest( void ) - /* HMAC SHA-224 Single-Round Known Answer Test. */ - /***************************************************/ - -+#ifndef NO_SHA224_AVAILABLE - hmac_status = sftk_fips_HMAC(hmac_computed, - HMAC_known_secret_key, - HMAC_known_secret_key_length, -@@ -933,6 +936,7 @@ sftk_fips_HMAC_PowerUpSelfTest( void ) - ( PORT_Memcmp( hmac_computed, known_SHA224_hmac, - SHA224_LENGTH ) != 0 ) ) - return( CKR_DEVICE_ERROR ); -+#endif - - /***************************************************/ - /* HMAC SHA-256 Single-Round Known Answer Test. */ -@@ -994,12 +998,14 @@ sftk_fips_SHA_PowerUpSelfTest( void ) - 0x72,0xf6,0xc7,0x22,0xf1,0x27,0x9f,0xf0, - 0xe0,0x68,0x47,0x7a}; - -+#ifndef NO_SHA224_AVAILABLE - /* SHA-224 Known Digest Message (224-bits). */ - static const PRUint8 sha224_known_digest[] = { - 0x89,0x5e,0x7f,0xfd,0x0e,0xd8,0x35,0x6f, - 0x64,0x6d,0xf2,0xde,0x5e,0xed,0xa6,0x7f, - 0x29,0xd1,0x12,0x73,0x42,0x84,0x95,0x4f, - 0x8e,0x08,0xe5,0xcb}; -+#endif - - /* SHA-256 Known Digest Message (256-bits). */ - static const PRUint8 sha256_known_digest[] = { -@@ -1048,6 +1054,7 @@ sftk_fips_SHA_PowerUpSelfTest( void ) - /* SHA-224 Single-Round Known Answer Hashing Test. */ - /***************************************************/ - -+#ifndef NO_SHA224_AVAILABLE - sha_status = SHA224_HashBuf( sha_computed_digest, known_hash_message, - FIPS_KNOWN_HASH_MESSAGE_LENGTH ); - -@@ -1055,6 +1062,7 @@ sftk_fips_SHA_PowerUpSelfTest( void ) - ( PORT_Memcmp( sha_computed_digest, sha224_known_digest, - SHA224_LENGTH ) != 0 ) ) - return( CKR_DEVICE_ERROR ); -+#endif - - /***************************************************/ - /* SHA-256 Single-Round Known Answer Hashing Test. */ -diff -up ./mozilla/security/nss/lib/softoken/pkcs11c.c.nosha224 ./mozilla/security/nss/lib/softoken/pkcs11c.c ---- ./mozilla/security/nss/lib/softoken/pkcs11c.c.nosha224 2011-09-21 11:49:16.000000000 -0700 -+++ ./mozilla/security/nss/lib/softoken/pkcs11c.c 2011-12-04 22:03:47.313609956 -0800 -@@ -1316,7 +1316,9 @@ CK_RV NSC_DigestInit(CK_SESSION_HANDLE h - INIT_MECH(CKM_MD2, MD2) - INIT_MECH(CKM_MD5, MD5) - INIT_MECH(CKM_SHA_1, SHA1) -+#ifndef NO_SHA224_AVAILABLE - INIT_MECH(CKM_SHA224, SHA224) -+#endif - INIT_MECH(CKM_SHA256, SHA256) - INIT_MECH(CKM_SHA384, SHA384) - INIT_MECH(CKM_SHA512, SHA512) -@@ -1440,7 +1442,9 @@ sftk_doSub ## mmm(SFTKSessionContext *co - DOSUB(MD2) - DOSUB(MD5) - DOSUB(SHA1) -+#ifndef NO_SHA224_AVAILABLE - DOSUB(SHA224) -+#endif - DOSUB(SHA256) - DOSUB(SHA384) - DOSUB(SHA512) -@@ -2013,7 +2017,9 @@ CK_RV NSC_SignInit(CK_SESSION_HANDLE hSe - INIT_RSA_SIGN_MECH(MD5) - INIT_RSA_SIGN_MECH(MD2) - INIT_RSA_SIGN_MECH(SHA1) -+#ifndef NO_SHA224_AVAILABLE - INIT_RSA_SIGN_MECH(SHA224) -+#endif - INIT_RSA_SIGN_MECH(SHA256) - INIT_RSA_SIGN_MECH(SHA384) - INIT_RSA_SIGN_MECH(SHA512) -@@ -2131,7 +2137,9 @@ finish_rsa: - - INIT_HMAC_MECH(MD2) - INIT_HMAC_MECH(MD5) -+#ifndef NO_SHA224_AVAILABLE - INIT_HMAC_MECH(SHA224) -+#endif - INIT_HMAC_MECH(SHA256) - INIT_HMAC_MECH(SHA384) - INIT_HMAC_MECH(SHA512) -@@ -2529,7 +2537,9 @@ CK_RV NSC_VerifyInit(CK_SESSION_HANDLE h - INIT_RSA_VFY_MECH(MD5) - INIT_RSA_VFY_MECH(MD2) - INIT_RSA_VFY_MECH(SHA1) -+#ifndef NO_SHA224_AVAILABLE - INIT_RSA_VFY_MECH(SHA224) -+#endif - INIT_RSA_VFY_MECH(SHA256) - INIT_RSA_VFY_MECH(SHA384) - INIT_RSA_VFY_MECH(SHA512) -@@ -2626,7 +2636,9 @@ finish_rsa: - - INIT_HMAC_MECH(MD2) - INIT_HMAC_MECH(MD5) -+#ifndef NO_SHA224_AVAILABLE - INIT_HMAC_MECH(SHA224) -+#endif - INIT_HMAC_MECH(SHA256) - INIT_HMAC_MECH(SHA384) - INIT_HMAC_MECH(SHA512) -diff -up ./mozilla/security/nss/lib/softoken/pkcs11.c.nosha224 ./mozilla/security/nss/lib/softoken/pkcs11.c ---- ./mozilla/security/nss/lib/softoken/pkcs11.c.nosha224 2011-01-21 16:12:04.000000000 -0800 -+++ ./mozilla/security/nss/lib/softoken/pkcs11.c 2011-12-04 22:03:47.316609956 -0800 -@@ -311,8 +311,10 @@ static const struct mechanismList mechan - CKF_SN_VR}, PR_TRUE}, - {CKM_SHA1_RSA_PKCS, {RSA_MIN_MODULUS_BITS,CK_MAX, - CKF_SN_VR}, PR_TRUE}, -+#ifndef NO_SHA224_AVAILABLE - {CKM_SHA224_RSA_PKCS, {RSA_MIN_MODULUS_BITS,CK_MAX, - CKF_SN_VR}, PR_TRUE}, -+#endif - {CKM_SHA256_RSA_PKCS, {RSA_MIN_MODULUS_BITS,CK_MAX, - CKF_SN_VR}, PR_TRUE}, - {CKM_SHA384_RSA_PKCS, {RSA_MIN_MODULUS_BITS,CK_MAX, -@@ -401,9 +403,11 @@ static const struct mechanismList mechan - {CKM_SHA_1, {0, 0, CKF_DIGEST}, PR_FALSE}, - {CKM_SHA_1_HMAC, {1, 128, CKF_SN_VR}, PR_TRUE}, - {CKM_SHA_1_HMAC_GENERAL, {1, 128, CKF_SN_VR}, PR_TRUE}, -+#ifndef NO_SHA224_AVAILABLE - {CKM_SHA224, {0, 0, CKF_DIGEST}, PR_FALSE}, - {CKM_SHA224_HMAC, {1, 128, CKF_SN_VR}, PR_TRUE}, - {CKM_SHA224_HMAC_GENERAL, {1, 128, CKF_SN_VR}, PR_TRUE}, -+#endif - {CKM_SHA256, {0, 0, CKF_DIGEST}, PR_FALSE}, - {CKM_SHA256_HMAC, {1, 128, CKF_SN_VR}, PR_TRUE}, - {CKM_SHA256_HMAC_GENERAL, {1, 128, CKF_SN_VR}, PR_TRUE}, -diff -up ./mozilla/security/nss/lib/softoken/rsawrapr.c.nosha224 ./mozilla/security/nss/lib/softoken/rsawrapr.c ---- ./mozilla/security/nss/lib/softoken/rsawrapr.c.nosha224 2011-10-22 07:35:43.000000000 -0700 -+++ ./mozilla/security/nss/lib/softoken/rsawrapr.c 2011-12-04 22:03:47.316609956 -0800 -@@ -1173,9 +1173,11 @@ GetHashTypeFromMechanism(CK_MECHANISM_TY - case CKM_SHA_1: - case CKG_MGF1_SHA1: - return HASH_AlgSHA1; -+#ifndef NO_SHA224_AVAILABLE - case CKM_SHA224: - case CKG_MGF1_SHA224: - return HASH_AlgSHA224; -+#endif - case CKM_SHA256: - case CKG_MGF1_SHA256: - return HASH_AlgSHA256; -diff -up ./mozilla/security/nss/tests/cipher/cipher.txt.nosha224 ./mozilla/security/nss/tests/cipher/cipher.txt ---- ./mozilla/security/nss/tests/cipher/cipher.txt.nosha224 2010-08-17 22:57:05.000000000 -0700 -+++ ./mozilla/security/nss/tests/cipher/cipher.txt 2011-12-04 22:03:47.317609956 -0800 -@@ -73,7 +73,6 @@ - 0 md2_-H MD2_Hash - 0 md5_-H MD5_Hash - 0 sha1_-H SHA1_Hash -- 0 sha224_-H SHA224_Hash - 0 sha256_-H SHA256_Hash - 0 sha384_-H SHA384_Hash - 0 sha512_-H SHA512_Hash diff --git a/nss/patches/nss-646045.patch0 b/nss/patches/nss-646045.patch0 deleted file mode 100644 index 5492127..0000000 --- a/nss/patches/nss-646045.patch0 +++ /dev/null @@ -1,34 +0,0 @@ -diff -up ./mozilla/security/nss/tests/dbtests/dbtests.sh.noroot ./mozilla/security/nss/tests/dbtests/dbtests.sh ---- ./mozilla/security/nss/tests/dbtests/dbtests.sh.noroot 2011-04-06 09:56:07.207701000 -0700 -+++ ./mozilla/security/nss/tests/dbtests/dbtests.sh 2011-04-06 10:19:54.159552000 -0700 -@@ -201,6 +201,9 @@ dbtest_main() - cat $RONLY_DIR/* > /dev/null - fi - -+ # skipping the next two tests when user is root, -+ # otherwise they would fail due to rooty powers -+ if [[ $EUID -ne 0 ]] then - ${BINDIR}/dbtest -d $RONLY_DIR - ret=$? - if [ $ret -ne 46 ]; then -@@ -208,6 +211,10 @@ dbtest_main() - else - html_passed "Dbtest r/w didn't work in an readonly dir $ret" - fi -+ else -+ html_passed "Skipping Dbtest r/w in a readonly dir because user is root" -+ fi -+ if [[ $EUID -ne 0 ]] then - ${BINDIR}/certutil -D -n "TestUser" -d . - ret=$? - if [ $ret -ne 255 ]; then -@@ -215,6 +222,9 @@ dbtest_main() - else - html_passed "Certutil didn't work in an readonly dir $ret" - fi -+ else -+ html_passed "Skipping Certutil delete cert in an readonly directory test because user is root" -+ fi - - Echo "test opening the database ronly in a readonly directory" - diff --git a/nss/patches/nss-ckbi-1.88.rtm.patch0 b/nss/patches/nss-ckbi-1.88.rtm.patch0 deleted file mode 100644 index c6de789..0000000 --- a/nss/patches/nss-ckbi-1.88.rtm.patch0 +++ /dev/null @@ -1,637 +0,0 @@ -diff -up ./mozilla/security/nss/lib/ckfw/builtins/certdata.c.ckbi188 ./mozilla/security/nss/lib/ckfw/builtins/certdata.c ---- ./mozilla/security/nss/lib/ckfw/builtins/certdata.c.ckbi188 2011-11-03 16:29:17.081000000 -0700 -+++ ./mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-11-03 08:11:57.000000000 -0700 -@@ -35,7 +35,7 @@ - * - * ***** END LICENSE BLOCK ***** */ - #ifdef DEBUG --static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.82 $ $Date: 2011/09/02 19:40:56 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.82 $ $Date: 2011/09/02 19:40:56 $"; -+static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.83 $ $Date: 2011/11/03 15:11:57 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.83 $ $Date: 2011/11/03 15:11:57 $"; - #endif /* DEBUG */ - - #ifndef BUILTINS_H -@@ -1075,6 +1075,18 @@ static const CK_ATTRIBUTE_TYPE nss_built - static const CK_ATTRIBUTE_TYPE nss_builtins_types_339 [] = { - CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED - }; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_340 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_341 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_342 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE -+}; -+static const CK_ATTRIBUTE_TYPE nss_builtins_types_343 [] = { -+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED -+}; - #ifdef DEBUG - static const NSSItem nss_builtins_items_0 [] = { - { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -@@ -1083,7 +1095,7 @@ static const NSSItem nss_builtins_items_ - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)"CVS ID", (PRUint32)7 }, - { (void *)"NSS", (PRUint32)4 }, -- { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.82 $ $Date: 2011/09/02 19:40:56 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.82 $ $Date: 2011/09/02 19:40:56 $", (PRUint32)160 } -+ { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.83 $ $Date: 2011/11/03 15:11:57 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.83 $ $Date: 2011/11/03 15:11:57 $", (PRUint32)160 } - }; - #endif /* DEBUG */ - static const NSSItem nss_builtins_items_1 [] = { -@@ -22600,6 +22612,266 @@ static const NSSItem nss_builtins_items_ - { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; -+static const NSSItem nss_builtins_items_340 [] = { -+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)", (PRUint32)57 }, -+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, -+ { (void *)"\060\143\061\013\060\011\006\003\125\004\006\023\002\115\131\061" -+"\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145" -+"\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017" -+"\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061" -+"\044\060\042\006\003\125\004\003\023\033\104\151\147\151\163\151" -+"\147\156\040\123\145\162\166\145\162\040\111\104\040\050\105\156" -+"\162\151\143\150\051" -+, (PRUint32)101 }, -+ { (void *)"0", (PRUint32)2 }, -+ { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061" -+"\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157" -+"\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125" -+"\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165" -+"\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156" -+"\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105" -+"\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142" -+"\141\154\040\122\157\157\164" -+, (PRUint32)119 }, -+ { (void *)"\002\006\007\377\377\377\377\377" -+, (PRUint32)8 }, -+ { (void *)"\060\202\003\315\060\202\003\066\240\003\002\001\002\002\006\007" -+"\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001" -+"\001\005\005\000\060\165\061\013\060\011\006\003\125\004\006\023" -+"\002\125\123\061\030\060\026\006\003\125\004\012\023\017\107\124" -+"\105\040\103\157\162\160\157\162\141\164\151\157\156\061\047\060" -+"\045\006\003\125\004\013\023\036\107\124\105\040\103\171\142\145" -+"\162\124\162\165\163\164\040\123\157\154\165\164\151\157\156\163" -+"\054\040\111\156\143\056\061\043\060\041\006\003\125\004\003\023" -+"\032\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040" -+"\107\154\157\142\141\154\040\122\157\157\164\060\036\027\015\060" -+"\067\060\067\061\067\061\065\061\067\064\071\132\027\015\061\062" -+"\060\067\061\067\061\065\061\066\065\065\132\060\143\061\013\060" -+"\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003" -+"\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144" -+"\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013" -+"\023\010\064\065\067\066\060\070\055\113\061\044\060\042\006\003" -+"\125\004\003\023\033\104\151\147\151\163\151\147\156\040\123\145" -+"\162\166\145\162\040\111\104\040\050\105\156\162\151\143\150\051" -+"\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001" -+"\005\000\003\201\215\000\060\201\211\002\201\201\000\255\250\144" -+"\113\115\207\307\204\131\271\373\220\106\240\246\211\300\361\376" -+"\325\332\124\202\067\015\231\053\105\046\012\350\126\260\177\312" -+"\250\364\216\107\204\001\202\051\343\263\152\265\221\363\373\225" -+"\205\274\162\250\144\350\012\100\234\305\364\161\256\173\173\152" -+"\007\352\220\024\117\215\211\257\224\253\262\006\324\002\152\173" -+"\230\037\131\271\072\315\124\372\040\337\262\052\012\351\270\335" -+"\151\220\300\051\323\116\320\227\355\146\314\305\031\111\006\177" -+"\372\136\054\174\173\205\033\062\102\337\173\225\045\002\003\001" -+"\000\001\243\202\001\170\060\202\001\164\060\022\006\003\125\035" -+"\023\001\001\377\004\010\060\006\001\001\377\002\001\000\060\134" -+"\006\003\125\035\040\004\125\060\123\060\110\006\011\053\006\001" -+"\004\001\261\076\001\000\060\073\060\071\006\010\053\006\001\005" -+"\005\007\002\001\026\055\150\164\164\160\072\057\057\143\171\142" -+"\145\162\164\162\165\163\164\056\157\155\156\151\162\157\157\164" -+"\056\143\157\155\057\162\145\160\157\163\151\164\157\162\171\056" -+"\143\146\155\060\007\006\005\140\203\112\001\001\060\016\006\003" -+"\125\035\017\001\001\377\004\004\003\002\001\346\060\201\211\006" -+"\003\125\035\043\004\201\201\060\177\241\171\244\167\060\165\061" -+"\013\060\011\006\003\125\004\006\023\002\125\123\061\030\060\026" -+"\006\003\125\004\012\023\017\107\124\105\040\103\157\162\160\157" -+"\162\141\164\151\157\156\061\047\060\045\006\003\125\004\013\023" -+"\036\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040" -+"\123\157\154\165\164\151\157\156\163\054\040\111\156\143\056\061" -+"\043\060\041\006\003\125\004\003\023\032\107\124\105\040\103\171" -+"\142\145\162\124\162\165\163\164\040\107\154\157\142\141\154\040" -+"\122\157\157\164\202\002\001\245\060\105\006\003\125\035\037\004" -+"\076\060\074\060\072\240\070\240\066\206\064\150\164\164\160\072" -+"\057\057\167\167\167\056\160\165\142\154\151\143\055\164\162\165" -+"\163\164\056\143\157\155\057\143\147\151\055\142\151\156\057\103" -+"\122\114\057\062\060\061\070\057\143\144\160\056\143\162\154\060" -+"\035\006\003\125\035\016\004\026\004\024\306\026\223\116\026\027" -+"\354\026\256\214\224\166\363\206\155\305\164\156\204\167\060\015" -+"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201" -+"\000\166\000\173\246\170\053\146\035\216\136\066\306\244\216\005" -+"\362\043\222\174\223\147\323\364\300\012\175\213\055\331\352\325" -+"\157\032\363\341\112\051\132\042\204\115\120\057\113\014\362\377" -+"\205\302\173\125\324\104\202\276\155\254\147\216\274\264\037\222" -+"\234\121\200\032\024\366\156\253\141\210\013\255\034\177\367\113" -+"\120\121\326\145\033\246\107\161\025\136\260\161\363\065\024\362" -+"\067\275\143\310\325\360\223\132\064\137\330\075\350\135\367\305" -+"\036\300\345\317\037\206\044\251\074\007\146\315\301\322\066\143" -+"\131" -+, (PRUint32)977 } -+}; -+static const NSSItem nss_builtins_items_341 [] = { -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)", (PRUint32)57 }, -+ { (void *)"\125\120\257\354\277\350\303\255\304\013\343\255\014\247\344\025" -+"\214\071\131\117" -+, (PRUint32)20 }, -+ { (void *)"\322\336\256\120\244\230\055\157\067\267\206\122\310\055\113\152" -+, (PRUint32)16 }, -+ { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061" -+"\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157" -+"\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125" -+"\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165" -+"\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156" -+"\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105" -+"\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142" -+"\141\154\040\122\157\157\164" -+, (PRUint32)119 }, -+ { (void *)"\002\006\007\377\377\377\377\377" -+, (PRUint32)8 }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } -+}; -+static const NSSItem nss_builtins_items_342 [] = { -+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)", (PRUint32)56 }, -+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, -+ { (void *)"\060\145\061\013\060\011\006\003\125\004\006\023\002\115\131\061" -+"\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145" -+"\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017" -+"\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061" -+"\046\060\044\006\003\125\004\003\023\035\104\151\147\151\163\151" -+"\147\156\040\123\145\162\166\145\162\040\111\104\040\055\040\050" -+"\105\156\162\151\143\150\051" -+, (PRUint32)103 }, -+ { (void *)"0", (PRUint32)2 }, -+ { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" -+"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" -+"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" -+"\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143" -+"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151" -+"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006" -+"\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105" -+"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164" -+"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164" -+"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151" -+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" -+"\040\050\062\060\064\070\051" -+, (PRUint32)183 }, -+ { (void *)"\002\006\007\377\377\377\377\377" -+, (PRUint32)8 }, -+ { (void *)"\060\202\004\320\060\202\003\270\240\003\002\001\002\002\006\007" -+"\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001" -+"\001\005\005\000\060\201\264\061\024\060\022\006\003\125\004\012" -+"\023\013\105\156\164\162\165\163\164\056\156\145\164\061\100\060" -+"\076\006\003\125\004\013\024\067\167\167\167\056\145\156\164\162" -+"\165\163\164\056\156\145\164\057\103\120\123\137\062\060\064\070" -+"\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146\056" -+"\040\050\154\151\155\151\164\163\040\154\151\141\142\056\051\061" -+"\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071" -+"\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114" -+"\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023" -+"\052\105\156\164\162\165\163\164\056\156\145\164\040\103\145\162" -+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157" -+"\162\151\164\171\040\050\062\060\064\070\051\060\036\027\015\061" -+"\060\060\067\061\066\061\067\062\063\063\070\132\027\015\061\065" -+"\060\067\061\066\061\067\065\063\063\070\132\060\145\061\013\060" -+"\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003" -+"\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144" -+"\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013" -+"\023\010\064\065\067\066\060\070\055\113\061\046\060\044\006\003" -+"\125\004\003\023\035\104\151\147\151\163\151\147\156\040\123\145" -+"\162\166\145\162\040\111\104\040\055\040\050\105\156\162\151\143" -+"\150\051\060\202\001\042\060\015\006\011\052\206\110\206\367\015" -+"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202" -+"\001\001\000\305\211\344\364\015\006\100\222\131\307\032\263\065" -+"\321\016\114\052\063\371\370\257\312\236\177\356\271\247\155\140" -+"\364\124\350\157\325\233\363\033\143\061\004\150\162\321\064\026" -+"\214\264\027\054\227\336\163\305\330\220\025\240\032\053\365\313" -+"\263\110\206\104\360\035\210\114\316\101\102\032\357\365\014\336" -+"\376\100\332\071\040\367\006\125\072\152\235\106\301\322\157\245" -+"\262\310\127\076\051\243\234\340\351\205\167\146\350\230\247\044" -+"\176\276\300\131\040\345\104\157\266\127\330\276\316\302\145\167" -+"\130\306\141\101\321\164\004\310\177\111\102\305\162\251\162\026" -+"\356\214\335\022\135\264\112\324\321\257\120\267\330\252\165\166" -+"\150\255\076\135\252\060\155\141\250\253\020\133\076\023\277\063" -+"\340\257\104\235\070\042\133\357\114\057\246\161\046\025\046\312" -+"\050\214\331\372\216\216\251\242\024\065\342\233\044\210\264\364" -+"\177\205\235\203\117\007\241\266\024\220\066\304\064\034\215\046" -+"\141\155\023\157\170\276\350\217\047\307\113\204\226\243\206\150" -+"\014\043\276\013\354\214\224\000\251\004\212\023\220\367\337\205" -+"\154\014\261\002\003\001\000\001\243\202\001\064\060\202\001\060" -+"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006" -+"\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001\001" -+"\377\002\001\000\060\047\006\003\125\035\045\004\040\060\036\006" -+"\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005" -+"\007\003\002\006\010\053\006\001\005\005\007\003\004\060\063\006" -+"\010\053\006\001\005\005\007\001\001\004\047\060\045\060\043\006" -+"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072" -+"\057\057\157\143\163\160\056\145\156\164\162\165\163\164\056\156" -+"\145\164\060\104\006\003\125\035\040\004\075\060\073\060\071\006" -+"\005\140\203\112\001\001\060\060\060\056\006\010\053\006\001\005" -+"\005\007\002\001\026\042\150\164\164\160\072\057\057\167\167\167" -+"\056\144\151\147\151\143\145\162\164\056\143\157\155\056\155\171" -+"\057\143\160\163\056\150\164\155\060\062\006\003\125\035\037\004" -+"\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160\072" -+"\057\057\143\162\154\056\145\156\164\162\165\163\164\056\156\145" -+"\164\057\062\060\064\070\143\141\056\143\162\154\060\021\006\003" -+"\125\035\016\004\012\004\010\114\116\314\045\050\003\051\201\060" -+"\037\006\003\125\035\043\004\030\060\026\200\024\125\344\201\321" -+"\021\200\276\330\211\271\010\243\061\371\241\044\011\026\271\160" -+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003" -+"\202\001\001\000\227\114\357\112\072\111\254\162\374\060\040\153" -+"\264\051\133\247\305\225\004\220\371\062\325\302\205\152\336\003" -+"\241\067\371\211\000\260\132\254\125\176\333\103\065\377\311\001" -+"\370\121\276\314\046\312\310\152\244\304\124\076\046\036\347\014" -+"\243\315\227\147\224\335\246\102\353\134\315\217\071\171\153\063" -+"\171\041\006\171\372\202\104\025\231\314\301\267\071\323\106\142" -+"\174\262\160\353\157\316\040\252\076\031\267\351\164\202\234\264" -+"\245\113\115\141\000\067\344\207\322\362\024\072\144\174\270\251" -+"\173\141\340\223\042\347\325\237\076\107\346\066\166\240\123\330" -+"\000\003\072\017\265\063\376\226\312\323\322\202\072\056\335\327" -+"\110\341\344\247\151\314\034\351\231\112\347\312\160\105\327\013" -+"\007\016\232\165\033\320\057\222\157\366\244\007\303\275\034\113" -+"\246\204\266\175\250\232\251\322\247\051\361\013\127\151\036\227" -+"\127\046\354\053\103\254\324\105\203\005\000\351\343\360\106\100" -+"\007\372\352\261\121\163\223\034\245\335\123\021\067\310\052\247" -+"\025\047\035\264\252\314\177\252\061\060\374\270\105\237\110\011" -+"\355\020\342\305" -+, (PRUint32)1236 } -+}; -+static const NSSItem nss_builtins_items_343 [] = { -+ { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -+ { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)", (PRUint32)56 }, -+ { (void *)"\153\074\073\200\255\312\246\272\212\237\124\246\172\355\022\151" -+"\005\155\061\046" -+, (PRUint32)20 }, -+ { (void *)"\327\151\141\177\065\017\234\106\243\252\353\370\125\374\204\362" -+, (PRUint32)16 }, -+ { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156" -+"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125" -+"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056" -+"\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143" -+"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151" -+"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006" -+"\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105" -+"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164" -+"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164" -+"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151" -+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171" -+"\040\050\062\060\064\070\051" -+, (PRUint32)183 }, -+ { (void *)"\002\006\007\377\377\377\377\377" -+, (PRUint32)8 }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) }, -+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } -+}; - - builtinsInternalObject - nss_builtins_data[] = { -@@ -22944,11 +23216,15 @@ nss_builtins_data[] = { - { 11, nss_builtins_types_336, nss_builtins_items_336, {NULL} }, - { 13, nss_builtins_types_337, nss_builtins_items_337, {NULL} }, - { 11, nss_builtins_types_338, nss_builtins_items_338, {NULL} }, -- { 13, nss_builtins_types_339, nss_builtins_items_339, {NULL} } -+ { 13, nss_builtins_types_339, nss_builtins_items_339, {NULL} }, -+ { 11, nss_builtins_types_340, nss_builtins_items_340, {NULL} }, -+ { 13, nss_builtins_types_341, nss_builtins_items_341, {NULL} }, -+ { 11, nss_builtins_types_342, nss_builtins_items_342, {NULL} }, -+ { 13, nss_builtins_types_343, nss_builtins_items_343, {NULL} } - }; - const PRUint32 - #ifdef DEBUG -- nss_builtins_nObjects = 339+1; -+ nss_builtins_nObjects = 343+1; - #else -- nss_builtins_nObjects = 339; -+ nss_builtins_nObjects = 343; - #endif /* DEBUG */ -diff -up ./mozilla/security/nss/lib/ckfw/builtins/certdata.txt.ckbi188 ./mozilla/security/nss/lib/ckfw/builtins/certdata.txt ---- ./mozilla/security/nss/lib/ckfw/builtins/certdata.txt.ckbi188 2011-11-03 16:29:42.293000000 -0700 -+++ ./mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-11-03 08:11:58.000000000 -0700 -@@ -34,7 +34,7 @@ - # the terms of any one of the MPL, the GPL or the LGPL. - # - # ***** END LICENSE BLOCK ***** --CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.79 $ $Date: 2011/09/02 19:40:56 $" -+CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $" - - # - # certdata.txt -@@ -23299,3 +23299,284 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_N - CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED - CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\143\061\013\060\011\006\003\125\004\006\023\002\115\131\061 -+\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145 -+\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017 -+\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061 -+\044\060\042\006\003\125\004\003\023\033\104\151\147\151\163\151 -+\147\156\040\123\145\162\166\145\162\040\111\104\040\050\105\156 -+\162\151\143\150\051 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -+\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157 -+\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125 -+\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165 -+\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156 -+\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105 -+\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142 -+\141\154\040\122\157\157\164 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\006\007\377\377\377\377\377 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\003\315\060\202\003\066\240\003\002\001\002\002\006\007 -+\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001 -+\001\005\005\000\060\165\061\013\060\011\006\003\125\004\006\023 -+\002\125\123\061\030\060\026\006\003\125\004\012\023\017\107\124 -+\105\040\103\157\162\160\157\162\141\164\151\157\156\061\047\060 -+\045\006\003\125\004\013\023\036\107\124\105\040\103\171\142\145 -+\162\124\162\165\163\164\040\123\157\154\165\164\151\157\156\163 -+\054\040\111\156\143\056\061\043\060\041\006\003\125\004\003\023 -+\032\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040 -+\107\154\157\142\141\154\040\122\157\157\164\060\036\027\015\060 -+\067\060\067\061\067\061\065\061\067\064\071\132\027\015\061\062 -+\060\067\061\067\061\065\061\066\065\065\132\060\143\061\013\060 -+\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003 -+\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144 -+\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013 -+\023\010\064\065\067\066\060\070\055\113\061\044\060\042\006\003 -+\125\004\003\023\033\104\151\147\151\163\151\147\156\040\123\145 -+\162\166\145\162\040\111\104\040\050\105\156\162\151\143\150\051 -+\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001 -+\005\000\003\201\215\000\060\201\211\002\201\201\000\255\250\144 -+\113\115\207\307\204\131\271\373\220\106\240\246\211\300\361\376 -+\325\332\124\202\067\015\231\053\105\046\012\350\126\260\177\312 -+\250\364\216\107\204\001\202\051\343\263\152\265\221\363\373\225 -+\205\274\162\250\144\350\012\100\234\305\364\161\256\173\173\152 -+\007\352\220\024\117\215\211\257\224\253\262\006\324\002\152\173 -+\230\037\131\271\072\315\124\372\040\337\262\052\012\351\270\335 -+\151\220\300\051\323\116\320\227\355\146\314\305\031\111\006\177 -+\372\136\054\174\173\205\033\062\102\337\173\225\045\002\003\001 -+\000\001\243\202\001\170\060\202\001\164\060\022\006\003\125\035 -+\023\001\001\377\004\010\060\006\001\001\377\002\001\000\060\134 -+\006\003\125\035\040\004\125\060\123\060\110\006\011\053\006\001 -+\004\001\261\076\001\000\060\073\060\071\006\010\053\006\001\005 -+\005\007\002\001\026\055\150\164\164\160\072\057\057\143\171\142 -+\145\162\164\162\165\163\164\056\157\155\156\151\162\157\157\164 -+\056\143\157\155\057\162\145\160\157\163\151\164\157\162\171\056 -+\143\146\155\060\007\006\005\140\203\112\001\001\060\016\006\003 -+\125\035\017\001\001\377\004\004\003\002\001\346\060\201\211\006 -+\003\125\035\043\004\201\201\060\177\241\171\244\167\060\165\061 -+\013\060\011\006\003\125\004\006\023\002\125\123\061\030\060\026 -+\006\003\125\004\012\023\017\107\124\105\040\103\157\162\160\157 -+\162\141\164\151\157\156\061\047\060\045\006\003\125\004\013\023 -+\036\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040 -+\123\157\154\165\164\151\157\156\163\054\040\111\156\143\056\061 -+\043\060\041\006\003\125\004\003\023\032\107\124\105\040\103\171 -+\142\145\162\124\162\165\163\164\040\107\154\157\142\141\154\040 -+\122\157\157\164\202\002\001\245\060\105\006\003\125\035\037\004 -+\076\060\074\060\072\240\070\240\066\206\064\150\164\164\160\072 -+\057\057\167\167\167\056\160\165\142\154\151\143\055\164\162\165 -+\163\164\056\143\157\155\057\143\147\151\055\142\151\156\057\103 -+\122\114\057\062\060\061\070\057\143\144\160\056\143\162\154\060 -+\035\006\003\125\035\016\004\026\004\024\306\026\223\116\026\027 -+\354\026\256\214\224\166\363\206\155\305\164\156\204\167\060\015 -+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201 -+\000\166\000\173\246\170\053\146\035\216\136\066\306\244\216\005 -+\362\043\222\174\223\147\323\364\300\012\175\213\055\331\352\325 -+\157\032\363\341\112\051\132\042\204\115\120\057\113\014\362\377 -+\205\302\173\125\324\104\202\276\155\254\147\216\274\264\037\222 -+\234\121\200\032\024\366\156\253\141\210\013\255\034\177\367\113 -+\120\121\326\145\033\246\107\161\025\136\260\161\363\065\024\362 -+\067\275\143\310\325\360\223\132\064\137\330\075\350\135\367\305 -+\036\300\345\317\037\206\044\251\074\007\146\315\301\322\066\143 -+\131 -+END -+ -+# Trust for Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)" -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\125\120\257\354\277\350\303\255\304\013\343\255\014\247\344\025 -+\214\071\131\117 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\322\336\256\120\244\230\055\157\067\267\206\122\310\055\113\152 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -+\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157 -+\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125 -+\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165 -+\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156 -+\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105 -+\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142 -+\141\154\040\122\157\157\164 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\006\007\377\377\377\377\377 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\145\061\013\060\011\006\003\125\004\006\023\002\115\131\061 -+\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145 -+\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017 -+\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061 -+\046\060\044\006\003\125\004\003\023\035\104\151\147\151\163\151 -+\147\156\040\123\145\162\166\145\162\040\111\104\040\055\040\050 -+\105\156\162\151\143\150\051 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156 -+\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 -+\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 -+\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143 -+\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151 -+\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006 -+\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105 -+\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164 -+\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164 -+\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151 -+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 -+\040\050\062\060\064\070\051 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\006\007\377\377\377\377\377 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\004\320\060\202\003\270\240\003\002\001\002\002\006\007 -+\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001 -+\001\005\005\000\060\201\264\061\024\060\022\006\003\125\004\012 -+\023\013\105\156\164\162\165\163\164\056\156\145\164\061\100\060 -+\076\006\003\125\004\013\024\067\167\167\167\056\145\156\164\162 -+\165\163\164\056\156\145\164\057\103\120\123\137\062\060\064\070 -+\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146\056 -+\040\050\154\151\155\151\164\163\040\154\151\141\142\056\051\061 -+\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071 -+\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114 -+\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023 -+\052\105\156\164\162\165\163\164\056\156\145\164\040\103\145\162 -+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157 -+\162\151\164\171\040\050\062\060\064\070\051\060\036\027\015\061 -+\060\060\067\061\066\061\067\062\063\063\070\132\027\015\061\065 -+\060\067\061\066\061\067\065\063\063\070\132\060\145\061\013\060 -+\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003 -+\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144 -+\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013 -+\023\010\064\065\067\066\060\070\055\113\061\046\060\044\006\003 -+\125\004\003\023\035\104\151\147\151\163\151\147\156\040\123\145 -+\162\166\145\162\040\111\104\040\055\040\050\105\156\162\151\143 -+\150\051\060\202\001\042\060\015\006\011\052\206\110\206\367\015 -+\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202 -+\001\001\000\305\211\344\364\015\006\100\222\131\307\032\263\065 -+\321\016\114\052\063\371\370\257\312\236\177\356\271\247\155\140 -+\364\124\350\157\325\233\363\033\143\061\004\150\162\321\064\026 -+\214\264\027\054\227\336\163\305\330\220\025\240\032\053\365\313 -+\263\110\206\104\360\035\210\114\316\101\102\032\357\365\014\336 -+\376\100\332\071\040\367\006\125\072\152\235\106\301\322\157\245 -+\262\310\127\076\051\243\234\340\351\205\167\146\350\230\247\044 -+\176\276\300\131\040\345\104\157\266\127\330\276\316\302\145\167 -+\130\306\141\101\321\164\004\310\177\111\102\305\162\251\162\026 -+\356\214\335\022\135\264\112\324\321\257\120\267\330\252\165\166 -+\150\255\076\135\252\060\155\141\250\253\020\133\076\023\277\063 -+\340\257\104\235\070\042\133\357\114\057\246\161\046\025\046\312 -+\050\214\331\372\216\216\251\242\024\065\342\233\044\210\264\364 -+\177\205\235\203\117\007\241\266\024\220\066\304\064\034\215\046 -+\141\155\023\157\170\276\350\217\047\307\113\204\226\243\206\150 -+\014\043\276\013\354\214\224\000\251\004\212\023\220\367\337\205 -+\154\014\261\002\003\001\000\001\243\202\001\064\060\202\001\060 -+\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006 -+\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001\001 -+\377\002\001\000\060\047\006\003\125\035\045\004\040\060\036\006 -+\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005 -+\007\003\002\006\010\053\006\001\005\005\007\003\004\060\063\006 -+\010\053\006\001\005\005\007\001\001\004\047\060\045\060\043\006 -+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072 -+\057\057\157\143\163\160\056\145\156\164\162\165\163\164\056\156 -+\145\164\060\104\006\003\125\035\040\004\075\060\073\060\071\006 -+\005\140\203\112\001\001\060\060\060\056\006\010\053\006\001\005 -+\005\007\002\001\026\042\150\164\164\160\072\057\057\167\167\167 -+\056\144\151\147\151\143\145\162\164\056\143\157\155\056\155\171 -+\057\143\160\163\056\150\164\155\060\062\006\003\125\035\037\004 -+\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160\072 -+\057\057\143\162\154\056\145\156\164\162\165\163\164\056\156\145 -+\164\057\062\060\064\070\143\141\056\143\162\154\060\021\006\003 -+\125\035\016\004\012\004\010\114\116\314\045\050\003\051\201\060 -+\037\006\003\125\035\043\004\030\060\026\200\024\125\344\201\321 -+\021\200\276\330\211\271\010\243\061\371\241\044\011\026\271\160 -+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003 -+\202\001\001\000\227\114\357\112\072\111\254\162\374\060\040\153 -+\264\051\133\247\305\225\004\220\371\062\325\302\205\152\336\003 -+\241\067\371\211\000\260\132\254\125\176\333\103\065\377\311\001 -+\370\121\276\314\046\312\310\152\244\304\124\076\046\036\347\014 -+\243\315\227\147\224\335\246\102\353\134\315\217\071\171\153\063 -+\171\041\006\171\372\202\104\025\231\314\301\267\071\323\106\142 -+\174\262\160\353\157\316\040\252\076\031\267\351\164\202\234\264 -+\245\113\115\141\000\067\344\207\322\362\024\072\144\174\270\251 -+\173\141\340\223\042\347\325\237\076\107\346\066\166\240\123\330 -+\000\003\072\017\265\063\376\226\312\323\322\202\072\056\335\327 -+\110\341\344\247\151\314\034\351\231\112\347\312\160\105\327\013 -+\007\016\232\165\033\320\057\222\157\366\244\007\303\275\034\113 -+\246\204\266\175\250\232\251\322\247\051\361\013\127\151\036\227 -+\127\046\354\053\103\254\324\105\203\005\000\351\343\360\106\100 -+\007\372\352\261\121\163\223\034\245\335\123\021\067\310\052\247 -+\025\047\035\264\252\314\177\252\061\060\374\270\105\237\110\011 -+\355\020\342\305 -+END -+ -+# Trust for Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)" -+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\153\074\073\200\255\312\246\272\212\237\124\246\172\355\022\151 -+\005\155\061\046 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\327\151\141\177\065\017\234\106\243\252\353\370\125\374\204\362 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156 -+\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125 -+\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056 -+\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143 -+\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151 -+\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006 -+\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105 -+\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164 -+\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164 -+\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151 -+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171 -+\040\050\062\060\064\070\051 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\006\007\377\377\377\377\377 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -diff -up ./mozilla/security/nss/lib/ckfw/builtins/nssckbi.h.ckbi188 ./mozilla/security/nss/lib/ckfw/builtins/nssckbi.h ---- ./mozilla/security/nss/lib/ckfw/builtins/nssckbi.h.ckbi188 2011-11-03 16:30:05.063000000 -0700 -+++ ./mozilla/security/nss/lib/ckfw/builtins/nssckbi.h 2011-11-03 08:11:58.000000000 -0700 -@@ -77,8 +77,8 @@ - * of the comment in the CK_VERSION type definition. - */ - #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1 --#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 87 --#define NSS_BUILTINS_LIBRARY_VERSION "1.87" -+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 88 -+#define NSS_BUILTINS_LIBRARY_VERSION "1.88" - - /* These version numbers detail the semantic changes to the ckfw engine. */ - #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1 diff --git a/nss/patches/nss-enable-pem.patch0 b/nss/patches/nss-enable-pem.patch0 deleted file mode 100644 index 665a148..0000000 --- a/nss/patches/nss-enable-pem.patch0 +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./mozilla/security/nss/lib/ckfw/manifest.mn.prepem ./mozilla/security/nss/lib/ckfw/manifest.mn ---- ./mozilla/security/nss/lib/ckfw/manifest.mn.prepem 2008-08-05 16:34:23.000000000 -0700 -+++ ./mozilla/security/nss/lib/ckfw/manifest.mn 2008-08-05 16:34:30.000000000 -0700 -@@ -38,7 +38,7 @@ MANIFEST_CVS_ID = "@(#) $RCSfile: manife - - CORE_DEPTH = ../../.. - --DIRS = builtins -+DIRS = builtins pem - - PRIVATE_EXPORTS = \ - ck.h \ diff --git a/nss/patches/nss-fix-gcc47-secmodt.patch0 b/nss/patches/nss-fix-gcc47-secmodt.patch0 deleted file mode 100644 index 361555e..0000000 --- a/nss/patches/nss-fix-gcc47-secmodt.patch0 +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./mozilla/security/nss/lib/softoken/secmodt.h.gcc47 ./mozilla/security/nss/lib/softoken/secmodt.h ---- ./mozilla/security/nss/lib/softoken/secmodt.h.gcc47 2012-01-30 16:14:41.179494528 -0500 -+++ ./mozilla/security/nss/lib/softoken/secmodt.h 2012-01-30 16:14:48.287424482 -0500 -@@ -338,7 +338,7 @@ typedef PRUint32 PK11AttrFlags; - #define SECMOD_SLOT_FLAGS "slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]" - - #define SECMOD_MAKE_NSS_FLAGS(fips,slot) \ --"Flags=internal,critical"fips" slotparams=("#slot"={"SECMOD_SLOT_FLAGS"})" -+"Flags=internal,critical" fips" slotparams=("#slot"={" SECMOD_SLOT_FLAGS"})" - - #define SECMOD_INT_NAME "NSS Internal PKCS #11 Module" - #define SECMOD_INT_FLAGS SECMOD_MAKE_NSS_FLAGS("",1) diff --git a/nss/patches/nss-ssl-cbc-random-iv-off-by-default.patch0 b/nss/patches/nss-ssl-cbc-random-iv-off-by-default.patch0 deleted file mode 100644 index 28dfa48..0000000 --- a/nss/patches/nss-ssl-cbc-random-iv-off-by-default.patch0 +++ /dev/null @@ -1,25 +0,0 @@ -diff -up ./mozilla/security/nss/lib/ssl/sslsock.c.compatible ./mozilla/security/nss/lib/ssl/sslsock.c ---- ./mozilla/security/nss/lib/ssl/sslsock.c.compatible 2012-01-05 13:54:36.430389994 -0800 -+++ ./mozilla/security/nss/lib/ssl/sslsock.c 2012-01-05 13:55:25.810750394 -0800 -@@ -184,7 +184,7 @@ static sslOptions ssl_defaults = { - 3, /* enableRenegotiation (default: transitional) */ - PR_FALSE, /* requireSafeNegotiation */ - PR_FALSE, /* enableFalseStart */ -- PR_TRUE /* cbcRandomIV */ -+ PR_FALSE /* cbcRandomIV */ /* defaults to off for compatibility */ - }; - - sslSessionIDLookupFunc ssl_sid_lookup; -@@ -2359,9 +2359,9 @@ ssl_SetDefaultsFromEnvironment(void) - PR_TRUE)); - } - ev = getenv("NSS_SSL_CBC_RANDOM_IV"); -- if (ev && ev[0] == '0') { -- ssl_defaults.cbcRandomIV = PR_FALSE; -- SSL_TRACE(("SSL: cbcRandomIV set to 0")); -+ if (ev && ev[0] == '1') { -+ ssl_defaults.cbcRandomIV = PR_TRUE; -+ SSL_TRACE(("SSL: cbcRandomIV set to 1")); - } - } - #endif /* NSS_HAVE_GETENV */ diff --git a/nss/patches/nsspem-bz754771.patch0 b/nss/patches/nsspem-bz754771.patch0 deleted file mode 100644 index 1e64a42..0000000 --- a/nss/patches/nsspem-bz754771.patch0 +++ /dev/null @@ -1,13 +0,0 @@ -diff -up ./mozilla/security/nss/lib/ckfw/pem/pinst.c.754771 ./mozilla/security/nss/lib/ckfw/pem/pinst.c ---- ./mozilla/security/nss/lib/ckfw/pem/pinst.c.754771 2011-12-12 09:38:51.839104295 -0800 -+++ ./mozilla/security/nss/lib/ckfw/pem/pinst.c 2011-12-12 09:44:40.437096761 -0800 -@@ -350,6 +350,9 @@ AddObjectIfNeeded(CK_OBJECT_CLASS objCla - if (io == NULL) - return NULL; - -+ /* initialize pointers to functions */ -+ pem_CreateMDObject(NULL, io, NULL); -+ - io->gobjIndex = count; - - /* add object to global array */ diff --git a/nss/patches/nsspem-createobject-initialize-pointer.patch0 b/nss/patches/nsspem-createobject-initialize-pointer.patch0 deleted file mode 100644 index cdfdea3..0000000 --- a/nss/patches/nsspem-createobject-initialize-pointer.patch0 +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ./mozilla/security/nss/lib/ckfw/pem/pobject.c.717338 ./mozilla/security/nss/lib/ckfw/pem/pobject.c ---- ./mozilla/security/nss/lib/ckfw/pem/pobject.c.717338 2010-11-25 10:49:27.000000000 -0800 -+++ ./mozilla/security/nss/lib/ckfw/pem/pobject.c 2011-09-10 10:16:58.752726964 -0700 -@@ -1179,6 +1179,7 @@ pem_CreateObject - return (NSSCKMDObject *) NULL; - - certDER.len = 0; /* in case there is no equivalent cert */ -+ certDER.data = NULL; - - objid = -1; - for (i = 0; i < pem_nobjs; i++) { diff --git a/nss/patches/nsspem-init-inform-not-thread-safe.patch0 b/nss/patches/nsspem-init-inform-not-thread-safe.patch0 deleted file mode 100644 index 2df4fbe..0000000 --- a/nss/patches/nsspem-init-inform-not-thread-safe.patch0 +++ /dev/null @@ -1,129 +0,0 @@ ---- mozilla/security/nss/lib/ckfw/pem/pinst.c.736410 2010-11-25 11:51:52.000000000 -0800 -+++ mozilla/security/nss/lib/ckfw/pem/pinst.c 2011-09-13 16:59:49.325215540 -0700 -@@ -364,39 +364,37 @@ AddObjectIfNeeded(CK_OBJECT_CLASS objCla - size += PEM_ITEM_CHUNK; - } - gobj[count] = io; - count++; - pem_nobjs++; - - io->refCount ++; - return io; - } - - CK_RV - AddCertificate(char *certfile, char *keyfile, PRBool cacert, - CK_SLOT_ID slotID) - { - pemInternalObject *o; -- SECItem certDER; - CK_RV error = 0; - int objid, i; - int nobjs = 0; - SECItem **objs = NULL; - char *ivstring = NULL; - int cipher; - -- certDER.data = NULL; - nobjs = ReadDERFromFile(&objs, certfile, PR_TRUE, &cipher, &ivstring, PR_TRUE /* certs only */); - if (nobjs <= 0) { - nss_ZFreeIf(objs); - return CKR_GENERAL_ERROR; - } - - /* For now load as many certs as are in the file for CAs only */ - if (cacert) { - for (i = 0; i < nobjs; i++) { - char nickname[1024]; - objid = pem_nobjs + 1; - - snprintf(nickname, 1024, "%s - %d", certfile, i); - - o = AddObjectIfNeeded(CKO_CERTIFICATE, pemCert, objs[i], NULL, -@@ -456,72 +454,76 @@ AddCertificate(char *certfile, char *key - loser: - nss_ZFreeIf(objs); - nss_ZFreeIf(o); - return error; - } - - CK_RV - pem_Initialize - ( - NSSCKMDInstance * mdInstance, - NSSCKFWInstance * fwInstance, - NSSUTF8 * configurationData - ) - { - CK_RV rv; -- /* parse the initialization string and initialize CRLInstances */ -+ /* parse the initialization string */ - char **certstrings = NULL; -+ char *modparms = NULL; - PRInt32 numcerts = 0; - PRBool status, error = PR_FALSE; - int i; -+ CK_C_INITIALIZE_ARGS_PTR modArgs = NULL; -+ -+ if (!fwInstance) return CKR_ARGUMENTS_BAD; -+ -+ modArgs = NSSCKFWInstance_GetInitArgs(fwInstance); -+ if (modArgs && -+ ((modArgs->flags & CKF_OS_LOCKING_OK) || (modArgs->CreateMutex != 0))) { -+ return CKR_CANT_LOCK; -+ } - - if (pemInitialized) { - return CKR_OK; - } -+ - RNG_RNGInit(); - - open_log(); - - plog("pem_Initialize\n"); - -- unsigned char *modparms = NULL; -- if (!fwInstance) { -- return CKR_ARGUMENTS_BAD; -- } -- -- CK_C_INITIALIZE_ARGS_PTR modArgs = -- NSSCKFWInstance_GetInitArgs(fwInstance); - if (!modArgs || !modArgs->LibraryParameters) { - goto done; - } -- modparms = (unsigned char *) modArgs->LibraryParameters; -+ modparms = (char *) modArgs->LibraryParameters; - plog("Initialized with %s\n", modparms); - - /* - * The initialization string format is a space-delimited file of - * pairs of paths which are delimited by a semi-colon. The first - * entry of the pair is the path to the certificate file. The - * second is the path to the key file. - * - * CA certificates do not need the semi-colon. - * - * Example: - * /etc/certs/server.pem;/etc/certs/server.key /etc/certs/ca.pem - * - */ - status = -- pem_ParseString((const char *) modparms, ' ', &numcerts, -+ pem_ParseString(modparms, ' ', &numcerts, - &certstrings); - if (status == PR_FALSE) { - return CKR_ARGUMENTS_BAD; - } - - for (i = 0; i < numcerts && error != PR_TRUE; i++) { - char *cert = certstrings[i]; - PRInt32 attrcount = 0; - char **certattrs = NULL; - status = pem_ParseString(cert, ';', &attrcount, &certattrs); - if (status == PR_FALSE) { - error = PR_TRUE; - break; - } - diff --git a/nss/patches/renegotiate-transitional.patch0 b/nss/patches/renegotiate-transitional.patch0 deleted file mode 100644 index 989491d..0000000 --- a/nss/patches/renegotiate-transitional.patch0 +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mozilla/security/nss/lib/ssl/sslsock.c.transitional mozilla/security/nss/lib/ssl/sslsock.c ---- mozilla/security/nss/lib/ssl/sslsock.c.transitional 2011-10-06 10:37:47.156659000 -0700 -+++ mozilla/security/nss/lib/ssl/sslsock.c 2011-10-06 10:38:32.276704000 -0700 -@@ -182,7 +182,7 @@ static sslOptions ssl_defaults = { - PR_FALSE, /* noLocks */ - PR_FALSE, /* enableSessionTickets */ - PR_FALSE, /* enableDeflate */ -- 2, /* enableRenegotiation (default: requires extension) */ -+ 3, /* enableRenegotiation (default: transitional) */ - PR_FALSE, /* requireSafeNegotiation */ - PR_FALSE, /* enableFalseStart */ - PR_TRUE /* cbcRandomIV */ diff --git a/nss/secmod.db b/nss/secmod.db deleted file mode 100644 index 9a02807..0000000 Binary files a/nss/secmod.db and /dev/null differ diff --git a/nss/setup-nsssysinit.sh b/nss/setup-nsssysinit.sh deleted file mode 100755 index 8e1f5f7..0000000 --- a/nss/setup-nsssysinit.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# -# Turns on or off the nss-sysinit module db by editing the -# global PKCS #11 congiguration file. Displays the status. -# -# This script can be invoked by the user as super user. -# It is invoked at nss-sysinit post install time with argument on. -# -usage() -{ - cat <<EOF -Usage: setup-nsssysinit [on|off] - on - turns on nsssysinit - off - turns off nsssysinit - status - reports whether nsssysinit is turned on or off -EOF - exit $1 -} - -# validate -if [ $# -eq 0 ]; then - usage 1 1>&2 -fi - -# the system-wide configuration file -p11conf="/etc/pki/nssdb/pkcs11.txt" -# must exist, otherwise report it and exit with failure -if [ ! -f $p11conf ]; then - echo "Could not find ${p11conf}" - exit 1 -fi - -# check if nsssysinit is currently enabled or disabled -sysinit_enabled() -{ - grep -q '^library=libnsssysinit' ${p11conf} -} - -umask 022 -case "$1" in - on | ON ) - if sysinit_enabled; then - exit 0 - fi - cat ${p11conf} | \ - sed -e 's/^library=$/library=libnsssysinit.so/' \ - -e '/^NSS/s/$Flags=internal$$,[^m]$/\1,moduleDBOnly\2/' > \ - ${p11conf}.on - mv ${p11conf}.on ${p11conf} - ;; - off | OFF ) - if ! sysinit_enabled; then - exit 0 - fi - cat ${p11conf} | \ - sed -e 's/^library=libnsssysinit.so/library=/' \ - -e '/^NSS/s/Flags=internal,moduleDBOnly/Flags=internal/' > \ - ${p11conf}.off - mv ${p11conf}.off ${p11conf} - ;; - status ) - echo -n 'NSS sysinit is ' - sysinit_enabled && echo 'enabled' || echo 'disabled' - ;; - * ) - usage 1 1>&2 - ;; -esac diff --git a/nss/system-pkcs11.txt b/nss/system-pkcs11.txt deleted file mode 100644 index c2f5704..0000000 --- a/nss/system-pkcs11.txt +++ /dev/null @@ -1,5 +0,0 @@ -library=libnsssysinit.so -name=NSS Internal PKCS #11 Module -parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' -NSS=Flags=internal,moduleDBOnly,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) - hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 743186103f1513088a85625ba03a0eabcd5b4fc6
by git＠ipfire.org 10 Feb '13

10 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 743186103f1513088a85625ba03a0eabcd5b4fc6 (commit) from 0f632aefe994452fc0263db1c871ba49ac1cbbbd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 743186103f1513088a85625ba03a0eabcd5b4fc6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 10 22:49:14 2013 +0100 libsolv: Update to git version f663ca2. ----------------------------------------------------------------------- Summary of changes: libsolv/libsolv.nm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) Difference in files: diff --git a/libsolv/libsolv.nm b/libsolv/libsolv.nm index e1c8d1d..2488344 100644 --- a/libsolv/libsolv.nm +++ b/libsolv/libsolv.nm @@ -5,8 +5,8 @@ name = libsolv version = 0.0.0 -git_ver = c02d759 -release = 6.git%{git_ver} +git_ver = f663ca2 +release = 7.git%{git_ver} maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Libraries @@ -19,9 +19,8 @@ description resolver written in C++. end -thisapp = %{name}-%{version}-%{git_ver} - -source_dl = +thisapp = %{name}-%{git_ver} +sources = %{thisapp}.tar.xz build requires @@ -32,12 +31,7 @@ build zlib-devel end - prepare_cmds - # Make sure that libsatsolverext is linked properly to all needed - # libraries. - echo "TARGET_LINK_LIBRARIES(libsolvext libsolv \${EXPAT_LIBRARY} \${ZLIB_LIBRARY})" \ - >> ext/CMakeLists.txt - end + DIR_APP = %{DIR_SRC}/%{name} build mkdir build hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0f632aefe994452fc0263db1c871ba49ac1cbbbd
by git＠ipfire.org 10 Feb '13

10 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 0f632aefe994452fc0263db1c871ba49ac1cbbbd (commit) via 2e67c9e75ad93ff97180a6f58a1203d5392240b8 (commit) from ef8980a8367631c40ff30063658868bac520e0fb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0f632aefe994452fc0263db1c871ba49ac1cbbbd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 10 22:23:40 2013 +0100 gnutls: Update to 3.1.8. Requires libtasn1 >= 3.2. commit 2e67c9e75ad93ff97180a6f58a1203d5392240b8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 10 22:23:27 2013 +0100 libtasn1: Update to 3.2. ----------------------------------------------------------------------- Summary of changes: gnutls/gnutls.nm | 5 +++-- libtasn1/libtasn1.nm | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index 7ba949e..c2df49e 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -6,7 +6,7 @@ name = gnutls version = %{ver_maj}.%{ver_min} ver_maj = 3.1 -ver_min = 7 +ver_min = 8 release = 1 groups = System/Libraries @@ -29,7 +29,8 @@ build gettext guile-devel libgcrypt-devel - libtasn1-devel >= 3.0 + libidn-devel + libtasn1-devel >= 3.2 lzo-devel nettle-devel >= 2.5 perl diff --git a/libtasn1/libtasn1.nm b/libtasn1/libtasn1.nm index eda7e9f..ef0bc45 100644 --- a/libtasn1/libtasn1.nm +++ b/libtasn1/libtasn1.nm @@ -4,7 +4,7 @@ ############################################################################### name = libtasn1 -version = 3.0 +version = 3.2 release = 1 groups = System/Libraries @@ -27,7 +27,6 @@ end packages package %{name} - end package %{name}-devel template DEVEL hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. ef8980a8367631c40ff30063658868bac520e0fb
by git＠ipfire.org 10 Feb '13

10 Feb '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via ef8980a8367631c40ff30063658868bac520e0fb (commit) from ec04fe8c24d057e2bf08c6f2637866f61bf2494d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ef8980a8367631c40ff30063658868bac520e0fb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 10 19:29:16 2013 +0100 openvpn: Remove polarssl as a build dependency. It was never ment to use polarssl as the SSL implementation of openvpn, but I must have forgotten to remove the line. openvpn is not capable of all the features it normally supports when it is compiled with polarssl. ----------------------------------------------------------------------- Summary of changes: openvpn/openvpn.nm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Difference in files: diff --git a/openvpn/openvpn.nm b/openvpn/openvpn.nm index 6698978..88c9bd9 100644 --- a/openvpn/openvpn.nm +++ b/openvpn/openvpn.nm @@ -5,7 +5,7 @@ name = openvpn version = 2.3.0 -release = 1 +release = 2 groups = Networking/VPN url = http://openvpn.net/ @@ -31,7 +31,6 @@ build lzo-devel openssl-devel pam-devel - polarssl-devel end configure_options += \ hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2013