View | Details | Raw Unified | Return to bug 232460 | Differences between
and this patch

Collapse All | Expand All

(-)net-mgmt/ocsinventory-ocsreports/Makefile (-2 / +4 lines)
Lines 1-7 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	ocsinventory-ocsreports
3
PORTNAME=	ocsinventory-ocsreports
4
PORTVERSION=	2.5
4
PORTVERSION=	2.6
5
CATEGORIES=	net-mgmt
5
CATEGORIES=	net-mgmt
6
6
7
MAINTAINER=	dgeo@centrale-marseille.fr
7
MAINTAINER=	dgeo@centrale-marseille.fr
Lines 19-25 Link Here
19
GH_PROJECT=	OCSInventory-ocsreports
19
GH_PROJECT=	OCSInventory-ocsreports
20
SUB_FILES=	apache.conf pkg-message
20
SUB_FILES=	apache.conf pkg-message
21
21
22
ETCDIR=		${PREFIX}/etc/OCSInventory
22
ETCDIR=		${PREFIX}/etc/ocsinventory-server
23
23
24
do-install:
24
do-install:
25
	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR}
25
	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR}
Lines 27-31 Link Here
27
	${INSTALL_DATA} ${WRKSRC}/dbconfig.inc.php ${STAGEDIR}${WWWDIR}/dbconfig.inc.php.sample
27
	${INSTALL_DATA} ${WRKSRC}/dbconfig.inc.php ${STAGEDIR}${WWWDIR}/dbconfig.inc.php.sample
28
	${INSTALL_DATA} ${WRKSRC}/backend/require/cas.config.php ${STAGEDIR}${WWWDIR}/backend/require/cas.config.php.sample
28
	${INSTALL_DATA} ${WRKSRC}/backend/require/cas.config.php ${STAGEDIR}${WWWDIR}/backend/require/cas.config.php.sample
29
	${INSTALL_DATA} ${WRKDIR}/apache.conf ${STAGEDIR}${ETCDIR}/ocsreports.inc.sample
29
	${INSTALL_DATA} ${WRKDIR}/apache.conf ${STAGEDIR}${ETCDIR}/ocsreports.inc.sample
30
	${MKDIR} ${STAGEDIR}${DATADIR}/packages
31
	${MKDIR} ${STAGEDIR}${DATADIR}/snmp
30
32
31
.include <bsd.port.mk>
33
.include <bsd.port.mk>
(-)net-mgmt/ocsinventory-ocsreports/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1534580034
1
TIMESTAMP = 1583417456
2
SHA256 (OCSInventory-NG-OCSInventory-ocsreports-2.5_GH0.tar.gz) = 02e75c903ca4f1032e5dc779f8fb7cfbf51b804269ff358cff35176ae47321c0
2
SHA256 (OCSInventory-NG-OCSInventory-ocsreports-2.6_GH0.tar.gz) = bfd9e6e82e54d12e4b29e6a401b80fc9de95a4c7157fa2cc64c29d09f6c81060
3
SIZE (OCSInventory-NG-OCSInventory-ocsreports-2.5_GH0.tar.gz) = 3222390
3
SIZE (OCSInventory-NG-OCSInventory-ocsreports-2.6_GH0.tar.gz) = 2791940
(-)net-mgmt/ocsinventory-ocsreports/files/apache.conf.in (-4 / +4 lines)
Lines 64-70 Link Here
64
# 
64
# 
65
# Alias to put Deployment package files outside Apache document root directory
65
# Alias to put Deployment package files outside Apache document root directory
66
#
66
#
67
<Directory %%SHAREDIR%%/packages>
67
<Directory %%DATADIR%%/packages>
68
   <IfModule mod_authz_core.c>
68
   <IfModule mod_authz_core.c>
69
     # Apache 2.4
69
     # Apache 2.4
70
     Require all granted
70
     Require all granted
Lines 74-80 Link Here
74
     Allow from all
74
     Allow from all
75
   </IfModule>
75
   </IfModule>
76
</Directory>
76
</Directory>
77
Alias /ocs/packages %%SHAREDIR%%/packages
77
Alias /ocs/packages %%DATADIR%%/packages
78
78
79
79
80
################################################################################
80
################################################################################
Lines 82-88 Link Here
82
#
82
#
83
# Alias to put Snmp custom Mibs files outside Apache document root directory
83
# Alias to put Snmp custom Mibs files outside Apache document root directory
84
#
84
#
85
<Directory %%SHAREDIR%%/snmp>
85
<Directory %%DATADIR%%/snmp>
86
   <IfModule mod_authz_core.c>
86
   <IfModule mod_authz_core.c>
87
     # Apache 2.4
87
     # Apache 2.4
88
     Require all granted
88
     Require all granted
Lines 92-96 Link Here
92
     Allow from all
92
     Allow from all
93
   </IfModule>
93
   </IfModule>
94
</Directory>
94
</Directory>
95
Alias /ocs/snmp %%SHAREDIR%%/snmp
95
Alias /ocs/snmp %%DATADIR%%/snmp
96
96
(-)net-mgmt/ocsinventory-ocsreports/pkg-plist (-10 / +26 lines)
Lines 42-48 Link Here
42
%%WWWDIR%%/css/onglets.css
42
%%WWWDIR%%/css/onglets.css
43
%%WWWDIR%%/css/winclassic.css
43
%%WWWDIR%%/css/winclassic.css
44
@sample %%WWWDIR%%/dbconfig.inc.php.sample
44
@sample %%WWWDIR%%/dbconfig.inc.php.sample
45
%%WWWDIR%%/download/README
45
%%WWWDIR%%/extensions/Readme.md
46
%%WWWDIR%%/favicon.ico
46
%%WWWDIR%%/favicon.ico
47
%%WWWDIR%%/files/ocsbase.sql
47
%%WWWDIR%%/files/ocsbase.sql
48
%%WWWDIR%%/files/ocsbase_new.sql
48
%%WWWDIR%%/files/ocsbase_new.sql
Lines 56-61 Link Here
56
%%WWWDIR%%/files/update/7013.sql
56
%%WWWDIR%%/files/update/7013.sql
57
%%WWWDIR%%/files/update/7014.sql
57
%%WWWDIR%%/files/update/7014.sql
58
%%WWWDIR%%/files/update/7015.sql
58
%%WWWDIR%%/files/update/7015.sql
59
%%WWWDIR%%/files/update/7016.sql
60
%%WWWDIR%%/files/update/7017.sql
61
%%WWWDIR%%/files/update/7018.sql
62
%%WWWDIR%%/files/update/7019.sql
63
%%WWWDIR%%/files/update/7020.sql
64
%%WWWDIR%%/files/update/7021.sql
65
%%WWWDIR%%/files/update/7022.sql
59
%%WWWDIR%%/image/bootstrap-formhelpers-countries.flags.png
66
%%WWWDIR%%/image/bootstrap-formhelpers-countries.flags.png
60
%%WWWDIR%%/image/cadena_ferme.png
67
%%WWWDIR%%/image/cadena_ferme.png
61
%%WWWDIR%%/image/cadena_ouvert.png
68
%%WWWDIR%%/image/cadena_ouvert.png
Lines 444-449 Link Here
444
%%WWWDIR%%/plugins/computer_detail/cd_processors/cd_processors.php
451
%%WWWDIR%%/plugins/computer_detail/cd_processors/cd_processors.php
445
%%WWWDIR%%/plugins/computer_detail/cd_registry/cd_registry.php
452
%%WWWDIR%%/plugins/computer_detail/cd_registry/cd_registry.php
446
%%WWWDIR%%/plugins/computer_detail/cd_repository/cd_repository.php
453
%%WWWDIR%%/plugins/computer_detail/cd_repository/cd_repository.php
454
%%WWWDIR%%/plugins/computer_detail/cd_saas/cd_saas.php
447
%%WWWDIR%%/plugins/computer_detail/cd_slots/cd_slots.php
455
%%WWWDIR%%/plugins/computer_detail/cd_slots/cd_slots.php
448
%%WWWDIR%%/plugins/computer_detail/cd_softwares/cd_softwares.php
456
%%WWWDIR%%/plugins/computer_detail/cd_softwares/cd_softwares.php
449
%%WWWDIR%%/plugins/computer_detail/cd_sounds/cd_sounds.php
457
%%WWWDIR%%/plugins/computer_detail/cd_sounds/cd_sounds.php
Lines 556-561 Link Here
556
%%WWWDIR%%/plugins/main_sections/ms_export/ms_csv.php
564
%%WWWDIR%%/plugins/main_sections/ms_export/ms_csv.php
557
%%WWWDIR%%/plugins/main_sections/ms_export/ms_export_ocs.php
565
%%WWWDIR%%/plugins/main_sections/ms_export/ms_export_ocs.php
558
%%WWWDIR%%/plugins/main_sections/ms_export/ms_soft_csv.php
566
%%WWWDIR%%/plugins/main_sections/ms_export/ms_soft_csv.php
567
%%WWWDIR%%/plugins/main_sections/ms_extensionmanager/ms_extensionmanager.php
568
%%WWWDIR%%/plugins/main_sections/ms_saas_soft/ms_saas_soft.php
569
%%WWWDIR%%/plugins/main_sections/ms_soft_cat/ms_options_soft_cat.php
559
%%WWWDIR%%/plugins/main_sections/ms_groups/ms_custom_groups.php
570
%%WWWDIR%%/plugins/main_sections/ms_groups/ms_custom_groups.php
560
%%WWWDIR%%/plugins/main_sections/ms_groups/ms_group_show.php
571
%%WWWDIR%%/plugins/main_sections/ms_groups/ms_group_show.php
561
%%WWWDIR%%/plugins/main_sections/ms_groups/ms_groups.php
572
%%WWWDIR%%/plugins/main_sections/ms_groups/ms_groups.php
Lines 572-583 Link Here
572
%%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_custom_sup.php
583
%%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_custom_sup.php
573
%%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_custom_tag.php
584
%%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_custom_tag.php
574
%%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_multi_search.php
585
%%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_multi_search.php
575
%%WWWDIR%%/plugins/main_sections/ms_multi_search/ms_multi_search.php.back
576
%%WWWDIR%%/plugins/main_sections/ms_plugins/functions_check.php
586
%%WWWDIR%%/plugins/main_sections/ms_plugins/functions_check.php
577
%%WWWDIR%%/plugins/main_sections/ms_plugins/functions_delete.php
578
%%WWWDIR%%/plugins/main_sections/ms_plugins/functions_webservices.php
579
%%WWWDIR%%/plugins/main_sections/ms_plugins/ms_pluginsmanager.php
580
%%WWWDIR%%/plugins/main_sections/ms_plugins/plugins.class.php
581
%%WWWDIR%%/plugins/main_sections/ms_regconfig/ms_regconfig.php
587
%%WWWDIR%%/plugins/main_sections/ms_regconfig/ms_regconfig.php
582
%%WWWDIR%%/plugins/main_sections/ms_regconfig/require/function_regconfig.php
588
%%WWWDIR%%/plugins/main_sections/ms_regconfig/require/function_regconfig.php
583
%%WWWDIR%%/plugins/main_sections/ms_repart_tag/ms_repart_tag.php
589
%%WWWDIR%%/plugins/main_sections/ms_repart_tag/ms_repart_tag.php
Lines 591-599 Link Here
591
%%WWWDIR%%/plugins/main_sections/ms_snmp/ms_snmp_detail.php
597
%%WWWDIR%%/plugins/main_sections/ms_snmp/ms_snmp_detail.php
592
%%WWWDIR%%/plugins/main_sections/ms_snmp/require/function_snmp.php
598
%%WWWDIR%%/plugins/main_sections/ms_snmp/require/function_snmp.php
593
%%WWWDIR%%/plugins/main_sections/ms_soft_cat/ms_soft_cat.php
599
%%WWWDIR%%/plugins/main_sections/ms_soft_cat/ms_soft_cat.php
594
%%WWWDIR%%/plugins/main_sections/ms_stats/class/msstats.class.php
595
%%WWWDIR%%/plugins/main_sections/ms_stats/class/msstatsconnexion.class.php
596
%%WWWDIR%%/plugins/main_sections/ms_stats/class/msstatstop.class.php
597
%%WWWDIR%%/plugins/main_sections/ms_stats/files/ms_stats_top_soft.txt
600
%%WWWDIR%%/plugins/main_sections/ms_stats/files/ms_stats_top_soft.txt
598
%%WWWDIR%%/plugins/main_sections/ms_stats/ms_stats.php
601
%%WWWDIR%%/plugins/main_sections/ms_stats/ms_stats.php
599
%%WWWDIR%%/plugins/main_sections/ms_teledeploy/js/package-form.js
602
%%WWWDIR%%/plugins/main_sections/ms_teledeploy/js/package-form.js
Lines 666-671 Link Here
666
%%WWWDIR%%/require/config/XMLProfileSerializer.php
669
%%WWWDIR%%/require/config/XMLProfileSerializer.php
667
%%WWWDIR%%/require/config/XMLUrlsSerializer.php
670
%%WWWDIR%%/require/config/XMLUrlsSerializer.php
668
%%WWWDIR%%/require/config/include.php
671
%%WWWDIR%%/require/config/include.php
672
%%WWWDIR%%/require/console/Console.php
673
%%WWWDIR%%/require/extensions/ExtensionCommon.php
674
%%WWWDIR%%/require/extensions/ExtensionHook.php
675
%%WWWDIR%%/require/extensions/ExtensionManager.php
676
%%WWWDIR%%/require/extensions/include.php
669
%%WWWDIR%%/require/fichierConf.class.php
677
%%WWWDIR%%/require/fichierConf.class.php
670
%%WWWDIR%%/require/footer.php
678
%%WWWDIR%%/require/footer.php
671
%%WWWDIR%%/require/function_admininfo.php
679
%%WWWDIR%%/require/function_admininfo.php
Lines 701-715 Link Here
701
%%WWWDIR%%/require/menu/TxtMenuSerializer.php
709
%%WWWDIR%%/require/menu/TxtMenuSerializer.php
702
%%WWWDIR%%/require/menu/XMLMenuSerializer.php
710
%%WWWDIR%%/require/menu/XMLMenuSerializer.php
703
%%WWWDIR%%/require/menu/include.php
711
%%WWWDIR%%/require/menu/include.php
712
%%WWWDIR%%/require/news/News.php
704
%%WWWDIR%%/require/plugin/ComputerPlugin.php
713
%%WWWDIR%%/require/plugin/ComputerPlugin.php
705
%%WWWDIR%%/require/plugin/XMLPluginsSerializer.php
714
%%WWWDIR%%/require/plugin/XMLPluginsSerializer.php
706
%%WWWDIR%%/require/plugin/include.php
715
%%WWWDIR%%/require/plugin/include.php
716
%%WWWDIR%%/require/saas/Saas.php
707
%%WWWDIR%%/require/search/AccountinfoSearch.php
717
%%WWWDIR%%/require/search/AccountinfoSearch.php
708
%%WWWDIR%%/require/search/DatabaseSearch.php
718
%%WWWDIR%%/require/search/DatabaseSearch.php
719
%%WWWDIR%%/require/search/GroupSearch.php
709
%%WWWDIR%%/require/search/LegacySearch.php
720
%%WWWDIR%%/require/search/LegacySearch.php
710
%%WWWDIR%%/require/search/Search.php
721
%%WWWDIR%%/require/search/Search.php
711
%%WWWDIR%%/require/search/TranslationSearch.php
722
%%WWWDIR%%/require/search/TranslationSearch.php
712
%%WWWDIR%%/require/softwares/SoftwareCategory.php
723
%%WWWDIR%%/require/softwares/SoftwareCategory.php
724
%%WWWDIR%%/require/stats/Stats.php
713
%%WWWDIR%%/require/table/Column.php
725
%%WWWDIR%%/require/table/Column.php
714
%%WWWDIR%%/require/table/Columns.php
726
%%WWWDIR%%/require/table/Columns.php
715
%%WWWDIR%%/require/table/Table.php
727
%%WWWDIR%%/require/table/Table.php
Lines 721-734 Link Here
721
%%WWWDIR%%/require/tables/TableRenderer.php
733
%%WWWDIR%%/require/tables/TableRenderer.php
722
%%WWWDIR%%/require/tables/table.html.php
734
%%WWWDIR%%/require/tables/table.html.php
723
%%WWWDIR%%/require/tables/tables.js
735
%%WWWDIR%%/require/tables/tables.js
736
%%WWWDIR%%/require/teledeploy/Teledeploy.php
724
%%WWWDIR%%/require/views/forms.php
737
%%WWWDIR%%/require/views/forms.php
738
%%WWWDIR%%/templates/.htaccess
725
%%WWWDIR%%/templates/OCS_template.html
739
%%WWWDIR%%/templates/OCS_template.html
726
%%WWWDIR%%/themes/OCS/banniere.png
740
%%WWWDIR%%/themes/OCS/banniere.png
727
%%WWWDIR%%/themes/OCS/logo.png
741
%%WWWDIR%%/themes/OCS/logo.png
728
%%WWWDIR%%/themes/OCS/style.css
742
%%WWWDIR%%/themes/OCS/style.css
729
%%WWWDIR%%/tools/cron_mailer.php
743
%%WWWDIR%%/tools/cron_mailer.php
744
%%WWWDIR%%/tools/install_plugin.py
730
%%WWWDIR%%/tools/gz.php
745
%%WWWDIR%%/tools/gz.php
731
%%WWWDIR%%/tools/recompose_paquet.php
746
%%WWWDIR%%/tools/recompose_paquet.php
732
%%WWWDIR%%/update.php
747
%%WWWDIR%%/update.php
733
%%WWWDIR%%/upload/README
734
%%WWWDIR%%/var.php
748
%%WWWDIR%%/var.php
749
@dir %%DATADIR%%/packages
750
@dir %%DATADIR%%/snmp

Return to bug 232460