Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

freeradius2 - nuke PBI crap #17

Merged
merged 5 commits into from
Dec 9, 2015
Merged

freeradius2 - nuke PBI crap #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c2bc1c
Nuke PBI crap
doktornotor Dec 8, 2015
8828c2b
Bump freeradius2 package version
doktornotor Dec 8, 2015
3b4dbf3
Bump freeradius2 package version
doktornotor Dec 8, 2015
48216dd
Bump freeradius2 package version
doktornotor Dec 8, 2015
277d082
Quick hack for bootstrap usability
doktornotor Dec 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion net/pfSense-pkg-freeradius2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= pfSense-pkg-freeradius2
PORTVERSION= 1.6.19
PORTVERSION= 1.6.20
CATEGORIES= net
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
17 changes: 3 additions & 14 deletions net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradius.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,10 @@ require_once("util.inc");
require_once("xmlrpc.inc");
require_once("xmlrpc_client.inc");

// Check pfSense version
$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
if ($pfs_version == "2.1" || $pfs_version == "2.2")
define('FREERADIUS_BASE', '/usr/pbi/freeradius-' . php_uname("m"));
else
define('FREERADIUS_BASE', '/usr/local');
define('FREERADIUS_BASE', '/usr/local');
$bash_path = FREERADIUS_BASE . "/bin/bash";

if ($pfs_version == "2.2") {
define('FREERADIUS_LIB', FREERADIUS_BASE . '/local/lib');
define('FREERADIUS_ETC', FREERADIUS_BASE . '/local/etc');
} else {
define('FREERADIUS_LIB', FREERADIUS_BASE . '/lib');
define('FREERADIUS_ETC', FREERADIUS_BASE . '/etc');
}
define('FREERADIUS_LIB', FREERADIUS_BASE . '/lib');
define('FREERADIUS_ETC', FREERADIUS_BASE . '/etc');

// Check freeradius lib version
$frlib="";
Expand Down
3 changes: 1 addition & 2 deletions net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradius.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,11 @@
]]>
</copyright>
<name>freeradius</name>
<version>1.6.18</version>
<version>1.6.20</version>
<title>FreeRADIUS: Users</title>
<include_file>/usr/local/pkg/freeradius.inc</include_file>
<menu>
<name>FreeRADIUS</name>
<tooltiptext>Modify FreeRADIUS users, clients, and settings.</tooltiptext>
<section>Services</section>
<url>/pkg.php?xml=freeradius.xml</url>
</menu>
Expand Down
14 changes: 2 additions & 12 deletions net/pfSense-pkg-freeradius2/files/usr/local/share/pfSense-pkg-freeradius2/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,11 @@
On pfSense docs there is a how-to which could help you on porting users.]]></descr>
<pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
<category>Services</category>
<version>1.6.19</version>
<version>1.6.20</version>
<status>RC</status>
<required_version>2.2</required_version>
<required_version>2.3</required_version>
<maintainer>nachtfalkeaw@web.de</maintainer>
<depends_on_package_pbi>freeradius-2.2.6_3-##ARCH##.pbi</depends_on_package_pbi>
<config_file>https://packages.pfsense.org/packages/config/freeradius2/freeradius.xml</config_file>
<configurationfile>freeradius.xml</configurationfile>
<after_install_info>Please visit Services - FreeRADIUS menu to configure the package.</after_install_info>
<port_category>net</port_category>
<run_depends>sbin/radiusd:net/freeradius2 bin/bash:shells/bash</run_depends>
<build_pbi>
<ports_before>security/krb5</ports_before>
<port>net/freeradius2</port>
<ports_after>shells/bash</ports_after>
</build_pbi>
<build_options>freeradius_SET_FORCE=KERBEROS MYSQL PGSQL PERL PYTHON LDAP SSL_PORT</build_options>
</package>
</pfsensepkgs>
10 changes: 3 additions & 7 deletions net/pfSense-pkg-freeradius2/files/usr/local/www/freeradius_view_config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,9 @@ function get_file($file){
else{
$pgtitle = "FreeRADIUS: View Configuration";
include("head.inc");

include("fbegin.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>


<?php if ($savemsg) print_info_box($savemsg); ?>

<form action="freeradius_view_config.php" method="post">
Expand Down Expand Up @@ -169,8 +167,6 @@ function activitycallback_postfix_file(transport) {
}
</script>
<?php
include("fend.inc");
include("foot.inc");
}
?>
</body>
</html>