@@ -19,7 +19,7 @@ XDG_DATA_HOME=${XDG_DATA_HOME:-~/.local/share}
19
19
VENV_NAME=" letsencrypt"
20
20
VENV_PATH=${VENV_PATH:- " $XDG_DATA_HOME /$VENV_NAME " }
21
21
VENV_BIN=" $VENV_PATH /bin"
22
- LE_AUTO_VERSION=" 0.4.1 "
22
+ LE_AUTO_VERSION=" 0.4.2 "
23
23
24
24
# This script takes the same arguments as the main letsencrypt program, but it
25
25
# additionally responds to --verbose (more output) and --debug (allow support
@@ -421,6 +421,19 @@ TempDir() {
421
421
mktemp -d 2> /dev/null || mktemp -d -t ' le' # Linux || OS X
422
422
}
423
423
424
+ InstallRequirements () {
425
+ set +e
426
+ PEEP_OUT=` " $VENV_BIN /python" " $TEMP_DIR /peep.py" install -r " $TEMP_DIR /$1 " `
427
+ PEEP_STATUS=$?
428
+ set -e
429
+ if [ " $PEEP_STATUS " != 0 ]; then
430
+ # Report error. (Otherwise, be quiet.)
431
+ echo " Had a problem while downloading and verifying Python packages:"
432
+ echo " $PEEP_OUT "
433
+ rm -rf " $VENV_PATH "
434
+ exit 1
435
+ fi
436
+ }
424
437
425
438
426
439
if [ " $1 " = " --le-auto-phase2" ]; then
@@ -444,7 +457,17 @@ if [ "$1" = "--le-auto-phase2" ]; then
444
457
445
458
echo " Installing Python packages..."
446
459
TEMP_DIR=$( TempDir)
460
+ trap " rm -rf '$TEMP_DIR '" EXIT
447
461
# There is no $ interpolation due to quotes on starting heredoc delimiter.
462
+ # -------------------------------------------------------------------------
463
+ cat << "UNLIKELY_EOF " > "$TEMP_DIR/setuptools-requirements.txt"
464
+ # cryptography requires a more modern version of setuptools.
465
+ # sha256: _ANFf7h6utSdwJ-cMTOGNpPn3bbKgrtQpzmnc3nOWpo
466
+ # sha256: JPz8FTZKn-CaIg830tztyEl5Xj3j5LOT7piOZqnL2Fo
467
+ # sha256: gJaELiTE8ddN_xKr6Qwm0S8F0NmlbtXgb8qm-qHkC2o
468
+ setuptools==20.2.2
469
+
470
+ UNLIKELY_EOF
448
471
# -------------------------------------------------------------------------
449
472
cat << "UNLIKELY_EOF " > "$TEMP_DIR/letsencrypt-auto-requirements.txt"
450
473
# This is the flattened list of packages letsencrypt-auto installs. To generate
@@ -455,6 +478,11 @@ if [ "$1" = "--le-auto-phase2" ]; then
455
478
# sha256: YrCJpVvh2JSc0rx-DfC9254Cj678jDIDjMhIYq791uQ
456
479
argparse==1.4.0
457
480
481
+ # This comes before cffi because cffi will otherwise install an unchecked
482
+ # version via setup_requires.
483
+ # sha256: eVm0p0q9wnsxL-0cIebK-TCc4LKeqGtZH9Lpns3yf3M
484
+ pycparser==2.14
485
+
458
486
# sha256: U8HJ3bMEMVE-t_PN7wo-BrDxJSGIqqd0SvD1pM1F268
459
487
# sha256: pWj0nfyhKo2fNwGHJX78WKOBCeHu5xTZKFYdegGKZPg
460
488
# sha256: gJxsqM-8ruv71DK0V2ABtA04_yRjdzy1dXfXXhoCC8M
@@ -479,28 +507,28 @@ ConfigArgParse==0.10.0
479
507
# sha256: ovVlB3DhyH-zNa8Zqbfrc_wFzPIhROto230AzSvLCQI
480
508
configobj==5.0.6
481
509
482
- # sha256: 1U_hszrB4J8cEj4vl0948z6V1h1PSALdISIKXD6MEX0
483
- # sha256: B1X2aE4RhSAFs2MTdh7ctbqEOmTNAizhrC3L1JqTYG0
484
- # sha256: zjhNo4lZlluh90VKJfVp737yqxRd8ueiml4pS3TgRnc
485
- # sha256: GvQDkV3LmWHDB2iuZRr6tpKC0dpaut-mN1IhrBGHdQM
486
- # sha256: ag08d91PH-W8ZfJ--3fsjQSjiNpesl66DiBAwJgZ30o
487
- # sha256: KdelgcO6_wTh--IAaltHjZ7cfPmib8ijWUkkf09lA3k
488
- # sha256: IPAWEKpAh_bVadjMIMR4uB8DhIYnWqqx3Dx12VAsZ-A
489
- # sha256: l9hGUIulDVomml82OK4cFmWbNTFaH0B_oVF2cH2j0Jc
490
- # sha256: djfqRMLL1NsvLKccsmtmPRczORqnafi8g2xZVilbd5g
491
- # sha256: gR-eqJVbPquzLgQGU0XDB4Ui5rPuPZLz0n08fNcWpjM
492
- # sha256: DXCMjYz97Qm4fCoLqHY856ZjWG4EPmrEL9eDHpKQHLY
493
- # sha256: Efnq11YqPgATWGytM5o_em9Yg8zhw7S5jhrGnft3p_Y
494
- # sha256: dNhnm55-0ePs-wq1NNyTUruxz3PTYsmQkJTAlyivqJY
495
- # sha256: z1Hd-123eBaiB1OKZgEUuC4w4IAD_uhJmwILi4SA2sU
496
- # sha256: 47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
497
- # sha256: dITvgYGUFB3_eUdf-74vd6-FHiw7v-Lk1ZEjEi-KTjM
498
- # sha256: 7gLB6J7l7pUBV6VK1YTXN8Ec83putMCFPozz8n6WLcA
499
- # sha256: pfGPaxhQpVVKV9v2YsrSUSpGBW5paHJqmFjngN1bnQo
500
- # sha256: 26GA8xrb5xi6qdbPirY0hJSwlLK4GAL_8zvVDSfRPnM
501
- # sha256: 5RinlLjzjoOC9_B3kUGBPOtIE6z9MRVBwNsOGJ69eN4
502
- # sha256: f1FFn4TWcERCdeYVg59FQsk1R6Euk4oKSQba_l994VM
503
- cryptography==1.1.2
510
+ # sha256: Axk49zpcXrPoCeGP98rraGU1GHFBe-YFDLjIapogK5o
511
+ # sha256: oXmjjVD41otJHXoxPbePjKvikIQs7N3dx7NNQI5Z2wo
512
+ # sha256: kGyIsqrc-Zz6uyQJgmPRv2WrDIaIrN4Q2uHwnYZZIPE
513
+ # sha256: bnBsXGCIdwsdG2NOlZ4hlj4xWwJV9fR3cSWtPVQIKXc
514
+ # sha256: 9ev44xxI-HB5Idyg6ZTed4E6nJub8DwRnF3fl73P_nM
515
+ # sha256: x7ieQiiMx_vuOBLpnvXHRPIkUuEdaCL2gHr8bWs76D4
516
+ # sha256: hAjSmGWUcQnYto8YN6fN4apNyG4Peco7pYwMRORD1qU
517
+ # sha256: x-ds88PZJd0x-iOM-4Bs_7pxjA8IcH13pTh2hHeWmVY
518
+ # sha256: fY3jU4DzFwJ1i3dTu1xAcjgyxzAG3tsvkJm_YaN_coc
519
+ # sha256: XtvucfrlRp7oP-CjeGa5OYyM46RjJcJPzt-_CXu0ihk
520
+ # sha256: WU7a_kgBwTvcHMMF53BKkMGWF-lZNvarRX7k_-AAulA
521
+ # sha256: t_2xagp_SBvkLadEv-HqIWMCXeIfkPLGiKMW88NU2pw
522
+ # sha256: IHuL8P4JBzNt84tzO0h1Ic-eE4GJq6kjStVP5UXdDbg
523
+ # sha256: UJovBThicM94OZPJDUn_77PdYq7kW_HqjOPSzecnHCE
524
+ # sha256: rGm2XdGvAXnt5AyfFXiMiPc-Yo6mwFGd44OOJ5uziMY
525
+ # sha256: jfb61sauEv1wBOopNX8KK003dOrsp2VlMNCNLZDNQao
526
+ # sha256: C4uW3YHMFTOgTzA4LA_iHBly4Yn3lNDEJhoYzsCP2bU
527
+ # sha256: yuj8oYg_I8UOp42J3m_k_v20zqgxd3YPRxd1WUFN7ZM
528
+ # sha256: GkccpXapzc4bHNnzoisdCe5E1GhiA3VX3heRnA20RCU
529
+ # sha256: jsTo49RTs6G2O19Xc3pDTc8e5KLyb2_3xaN8P2eRBNI
530
+ # sha256: jrEcd92Oc_SN9rL3p-Fhc_4P6P3-JmIygy6IR34IRU4
531
+ cryptography==1.2.3
504
532
505
533
# sha256: JHXX_N31lR6S_1RpcnWIAt5SYL9Akxmp8ZNOa7yLHcc
506
534
# sha256: NZB977D5krdat3iPZf7cHPIP-iJojg5vbxKvwGs-pQE
@@ -528,9 +556,9 @@ ndg-httpsclient==0.4.0
528
556
# sha256: HDW0rCBs7y0kgWyJ-Jzyid09OM98RJuz-re_bUPwGx8
529
557
ordereddict==1.1
530
558
531
- # sha256: OnTxAPkNZZGDFf5kkHca0gi8PxOv0y01_P5OjQs7gSs
532
- # sha256: Paa-K-UG9ZzOMuGeMOIBBT4btNB-JWaJGOAPikmtQKs
533
- parsedatetime==1.5
559
+ # sha256: zp1CIWXPbpY5Bc1fdPJ06_fMmMlBkWFpF475Pw5VeDg
560
+ # sha256: F8V4d1UgyZExY04Jz8paBeqeG9KgXNBpZ-vs4Q33ry0
561
+ parsedatetime==2.1
534
562
535
563
# sha256: Rsjbda51oFa9HMB_ohc0_i5gPRGgeDPswe63TDXHLgw
536
564
# sha256: 4hJ2JqkebIhduJZol22zECDwry2nKJJLVkgPx8zwlkk
@@ -572,9 +600,6 @@ psutil==3.3.0
572
600
# sha256: hTys2W0fcB3dZ6oD7MBfUYkBNbcmLpInEBEvEqLtKn8
573
601
pyasn1==0.1.9
574
602
575
- # sha256: eVm0p0q9wnsxL-0cIebK-TCc4LKeqGtZH9Lpns3yf3M
576
- pycparser==2.14
577
-
578
603
# sha256: iORea7Jd_tJyoe8ucoRh1EtjTCzWiemJtuVqNJxaOuU
579
604
# sha256: 8KJgcNbbCIHei8x4RpNLfDyTDY-cedRYg-5ImEvA1nI
580
605
pyOpenSSL==0.15.1
@@ -653,17 +678,17 @@ mock==1.0.1
653
678
# THE LINES BELOW ARE EDITED BY THE RELEASE SCRIPT;
654
679
# ADD ALL DEPENDENCIES ABOVE
655
680
656
- # sha256: zd_qpRKPaFs00y5hex5Rbu5CVLWzed7pBGL28juxoHM
657
- # sha256: 18Gfo85AbZXE46GyTkyePthTNiUeoGTQNcXlSvmRQvM
658
- acme==0.4.1
681
+ # sha256: UMVihR1TbyvQNHzx1CzYiydDitJVGw_mLAGr3-gCGJk
682
+ # sha256: ClkIqiGQsLTyyLASRkWYniS9n4CAW6D4GSuBETXFALY
683
+ acme==0.4.2
659
684
660
- # sha256: wIuGh8yh1TeOClXW0qLz70bKeM9Ax4bfFNrkKSDjbbo
661
- # sha256: 7TeAUt8cZ0IZQuQNuUm8MoH8vPWlKaCrwWAkdCEs_5s
662
- letsencrypt==0.4.1
685
+ # sha256: hbUGND6Eo_q6a97o3o66wwLYJ7koNvwOXh9u5bZNCVI
686
+ # sha256: 460kqywseljbDW_Gr_ZU23rWlzNeE-AL4_JwYCRdS-Y
687
+ letsencrypt==0.4.2
663
688
664
- # sha256: bnpKXJTXy9cFSktJLtvTCTovJJybc__Ivqs6XaXxk9U
665
- # sha256: bcvJ6j5UB8sOJ_M88DAsqvmaLxD2UnAP9ys-_J6Bdcc
666
- letsencrypt-apache==0.4.1
689
+ # sha256: KNMAOMrJMr1vLJBDaihGqEmvPbfxgH_dvRk1OFHaM_I
690
+ # sha256: SXSg-gIabiV4CBzrfPIyABhfTjKl7YZrKDSVkfE4Vbo
691
+ letsencrypt-apache==0.4.2
667
692
668
693
UNLIKELY_EOF
669
694
# -------------------------------------------------------------------------
@@ -1641,18 +1666,8 @@ if __name__ == '__main__':
1641
1666
1642
1667
UNLIKELY_EOF
1643
1668
# -------------------------------------------------------------------------
1644
- set +e
1645
- PEEP_OUT=` " $VENV_BIN /python" " $TEMP_DIR /peep.py" install -r " $TEMP_DIR /letsencrypt-auto-requirements.txt" `
1646
- PEEP_STATUS=$?
1647
- set -e
1648
- rm -rf " $TEMP_DIR "
1649
- if [ " $PEEP_STATUS " != 0 ]; then
1650
- # Report error. (Otherwise, be quiet.)
1651
- echo " Had a problem while downloading and verifying Python packages:"
1652
- echo " $PEEP_OUT "
1653
- rm -rf " $VENV_PATH "
1654
- exit 1
1655
- fi
1669
+ InstallRequirements " setuptools-requirements.txt"
1670
+ InstallRequirements " letsencrypt-auto-requirements.txt"
1656
1671
echo " Installation succeeded."
1657
1672
fi
1658
1673
echo " Requesting root privileges to run letsencrypt..."
0 commit comments