Update current stable branch fo f23 and change freeswan to libreswan

4 files changed, 4 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index a1f04db..e4ff3e8 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ all: use-defaults
 use-defaults: prepare
 	(export dist=rawhide; export arch=i386; \
 	export nss_pkgs="nspr nss-util nss-softokn nss"; \
-	export clients="dconf evolution-data-server xulrunner"; \
+	export clients="dconf evolution-data-server libreswan xulrunner"; \
 	sh ./build_nss.sh)
 
 build-for-rawhide-i386: prepare
diff --git a/build_nss.py b/build_nss.py
index 0f72b03..ea70ccd 100755
--- a/build_nss.py
+++ b/build_nss.py
@@ -50,7 +50,7 @@ parser.add_argument('-f', '--flavor',
 
 parser.add_argument('-r', '--rel',
                     action="store", dest="rel", 
-                    default=None, choices=("rawhide", "f18" ),
+                    default=None, choices=("rawhide", "f23" ),
                     help='specify a release to use for mock config.  [default=None]')
 
 parser.add_argument('-a', '--arch', 
diff --git a/build_nss.sh b/build_nss.sh
index 6b4781f..92815af 100755
--- a/build_nss.sh
+++ b/build_nss.sh
@@ -29,7 +29,7 @@ nss_pkgs="nspr nss-util nss-softokn nss"
 nss_pkgs=${nss_pkgs:-$nss_pkgs}
 
 # listed in rough order of importance and dependencies fisrt
-all_clients="mod_nss mod_revocator curl evolution-data-server freeswan xulrunner crontabs crypto-utils "
+all_clients="mod_nss mod_revocator curl evolution-data-server libreswan xulrunner crontabs crypto-utils "
 clients=${clients:-$all_clients}
 workdir=`pwd`
 for pkg in ${nss_pkgs}; do
diff --git a/build_several_inside_mock.sh b/build_several_inside_mock.sh
index 1b59373..37fbff8 100755
--- a/build_several_inside_mock.sh
+++ b/build_several_inside_mock.sh
@@ -14,7 +14,7 @@ cd /builddir/build/RPMS/
 nss_pkgs="nspr nss-util nss-softokn nss"
 NSS_PKGS=${NSS_PKGS:-$nss_pkgs}
 
-client_pkgs="crypto-utils curl evolution-data-server mod_nss mod_revocator freswan xulrunner"
+client_pkgs="crypto-utils curl evolution-data-server mod_nss mod_revocator libreswan xulrunner"
 CLIENT_PKGS=${CLIENT_PKGS:-$client_pkgs}
 
 # build and install the nss packages