diff --git a/app-backup/luckybackup/luckybackup-0.5.0.recipe b/app-backup/luckybackup/luckybackup-0.5.0.recipe index a79e4894e..d536eb127 100644 --- a/app-backup/luckybackup/luckybackup-0.5.0.recipe +++ b/app-backup/luckybackup/luckybackup-0.5.0.recipe @@ -6,7 +6,7 @@ declared directories before proceeding in any data manipulation), reliable and \ fully customizable." COPYRIGHT="2008-2018 Loukas Avgeriou" LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" HOMEPAGE="http://luckybackup.sourceforge.net" SOURCE_URI="https://downloads.sourceforge.net/luckybackup/luckybackup-$portVersion.tar.gz" CHECKSUM_SHA256="e801af2483cbdd62bc9af8e2ded252c51adbad81482e291042f58e21c3d4925b" @@ -23,6 +23,7 @@ PROVIDES=" app:LuckyBackup = $portVersion " REQUIRES=" + cmd:rsync haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix diff --git a/app-backup/luckybackup/patches/luckybackup-0.5.0.patchset b/app-backup/luckybackup/patches/luckybackup-0.5.0.patchset index c56310fce..79ef5b5d9 100644 --- a/app-backup/luckybackup/patches/luckybackup-0.5.0.patchset +++ b/app-backup/luckybackup/patches/luckybackup-0.5.0.patchset @@ -1,11 +1,11 @@ -From ab3fd8dfc57e6240ffcba7605a6c9602125b00cb Mon Sep 17 00:00:00 2001 +From a4f13784c1087d1bc399e4c374ff8115a7577ccd Mon Sep 17 00:00:00 2001 From: mazbrili Date: Fri, 5 Oct 2018 09:28:19 +0700 Subject: set current dir to application dir diff --git a/src/main.cpp b/src/main.cpp -index 935603e..4f66bba 100644 +index e1f872c..dc6acc3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,6 +33,9 @@ @@ -30,20 +30,20 @@ index 935603e..4f66bba 100644 if (!argumentsTest(argc,argv)) return 1; // error code1: something wrong with the command arguments - app fail to start (or just --help or --version given as args) -- -2.19.0 +2.30.2 -From 8ea9eea609a179dfe67852cfab86250d10142f83 Mon Sep 17 00:00:00 2001 +From d2e474a331e753e36c56a5c2b53b2c346ba7ea88 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Wed, 17 Oct 2018 14:23:21 +0000 Subject: hardcode paths for Haiku diff --git a/src/global.cpp b/src/global.cpp -index 1efe3ed..3e0cb0f 100644 +index eaf70b4..8927cd0 100644 --- a/src/global.cpp +++ b/src/global.cpp -@@ -52,8 +52,8 @@ QString appVersionString = "0.4.9"; +@@ -52,8 +52,8 @@ QString appVersionString = "0.5.0"; double const validProfileVersion = 0.21; double const validScheduleVersion = 0.34; double const validSettingsVersion = 0.3; @@ -80,5 +80,792 @@ index 1efe3ed..3e0cb0f 100644 QString countStr; -- -2.19.1 +2.30.2 + + +From b3432232f4164103dd9127a86998d7bddc7f534d Mon Sep 17 00:00:00 2001 +From: mazbrili +Date: Wed, 14 Apr 2021 14:55:31 +0700 +Subject: Add option extended Attribute + + +diff --git a/src/global.cpp b/src/global.cpp +index 8927cd0..7ee272c 100644 +--- a/src/global.cpp ++++ b/src/global.cpp +@@ -1833,6 +1833,7 @@ QStringList AppendArguments(operation *operationToAppend) + if (operationToAppend -> GetOptionsNumericIDs()) arguments.append("--numeric-ids"); + if (operationToAppend -> GetOptionsUpdate()) arguments.append("--update"); + if (operationToAppend -> GetOptionsDelete()) arguments.append("--delete-after"); ++ if (operationToAppend -> GetOptionsAttr()) arguments.append("-X"); + count =0; + while ( count < (operationToAppend -> GetOptionsListSize()) ) + { +diff --git a/src/modifyDialog.cpp b/src/modifyDialog.cpp +index 1080fae..6058555 100644 +--- a/src/modifyDialog.cpp ++++ b/src/modifyDialog.cpp +@@ -1364,6 +1364,7 @@ operation *modifyDialog::fillOperationArray() + pTask -> SetOptionsRecurse ( uiM.checkBox_recurse -> isChecked() ); + pTask -> SetOptionsSuper ( uiM.checkBox_super -> isChecked() ); + pTask -> SetOptionsNumericIDs ( uiM.checkBox_numericIDs -> isChecked() ); ++ pTask -> SetOptionsAttr ( uiM.checkBox_attr -> isChecked() ); + // windows related rsync options + pTask -> SetOptionsRestorent ( uiM.checkBox_restorent -> isChecked() ); + pTask -> SetOptionsVss ( uiM.checkBox_vss -> isChecked() ); +@@ -1502,6 +1503,7 @@ void modifyDialog::fillModifyWindow(operation *pTask) + + uiM.checkBox_vss -> setChecked (pTask -> GetOptionsVss() ); + uiM.checkBox_restorent -> setChecked (pTask -> GetOptionsRestorent() ); ++ uiM.checkBox_attr -> setChecked (pTask -> GetOptionsAttr() ); + + count=0; + while ( count < (pTask -> GetOptionsListSize()) ) +@@ -1614,6 +1616,7 @@ void modifyDialog::modifyTrailing() + uiM.checkBox_update -> setChecked (true); + uiM.checkBox_ownership -> setChecked (true); + uiM.checkBox_permissions -> setChecked (true); ++ uiM.checkBox_attr -> setChecked (true); + } + + /*if (WINrunning) // some more adjustments for windows when the user wants to declare directly paths with "/" instead of "\" (normally for remote) +diff --git a/src/operationClass.h b/src/operationClass.h +index 0e054c3..fa177dd 100644 +--- a/src/operationClass.h ++++ b/src/operationClass.h +@@ -140,6 +140,7 @@ class operation + + bool GetOptionsUpdate () const {return itsOptionsUpdate;} + bool GetOptionsDelete () const {return itsOptionsDelete;} ++ bool GetOptionsAttr () const {return itsOptionsAttr;} + bool GetOptionsRecurse () const {return itsOptionsRecurse;} + bool GetOptionsOwnership () const {return itsOptionsOwnership;} + bool GetOptionsSymlinks () const {return itsOptionsSymlinks;} +@@ -273,6 +274,7 @@ class operation + // Command options - templates + void SetOptionsUpdate (bool OptionsUpdate) { itsOptionsUpdate = OptionsUpdate;} + void SetOptionsDelete (bool OptionsDelete) { itsOptionsDelete = OptionsDelete;} ++ void SetOptionsAttr (bool OptionsAttr) { itsOptionsAttr = OptionsAttr;} + void SetOptionsRecurse (bool OptionsRecurse) { itsOptionsRecurse = OptionsRecurse;} + void SetOptionsOwnership (bool OptionsOwnership) { itsOptionsOwnership = OptionsOwnership;} + void SetOptionsSymlinks (bool OptionsSymlinks) { itsOptionsSymlinks = OptionsSymlinks;} +@@ -365,6 +367,7 @@ class operation + int itsRemoteSSHPort; + + bool itsOptionsUpdate; ++ bool itsOptionsAttr; + bool itsOptionsDelete; + bool itsOptionsRecurse; + bool itsOptionsOwnership; +diff --git a/ui/modifyDialog.ui b/ui/modifyDialog.ui +index 842274a..3daba07 100644 +--- a/ui/modifyDialog.ui ++++ b/ui/modifyDialog.ui +@@ -325,7 +325,7 @@ + QTabWidget::North + + +- 0 ++ 4 + + + +@@ -362,8 +362,8 @@ + + 0 + 0 +- 570 +- 300 ++ 475 ++ 362 + + + +@@ -692,8 +692,8 @@ + + 0 + 0 +- 213 +- 283 ++ 214 ++ 217 + + + +@@ -1974,8 +1974,8 @@ If you have no idea what these mean, leave them untouched !! + + 0 + 0 +- 570 +- 300 ++ 475 ++ 362 + + + +@@ -2053,8 +2053,8 @@ If you have no idea what these mean, leave them untouched !! + + + +- +- ++ ++ + + + 0 +@@ -2071,19 +2071,19 @@ If you have no idea what these mean, leave them untouched !! + PointingHandCursor + + +- Preserve permissions of files +-(-p) ++ Recurse into directories ++(-r) + + +- Preserve permissions ++ Recurse into directories + + + true + + + +- +- ++ ++ + + + 0 +@@ -2100,11 +2100,11 @@ If you have no idea what these mean, leave them untouched !! + PointingHandCursor + + +- Recurse into directories +-(-r) ++ Preserve permissions of files ++(-p) + + +- Recurse into directories ++ Preserve permissions + + + true +@@ -2140,8 +2140,8 @@ If you have no idea what these mean, leave them untouched !! + + + +- +- ++ ++ + + + 0 +@@ -2158,14 +2158,11 @@ If you have no idea what these mean, leave them untouched !! + PointingHandCursor + + +- Do not backup source files that are newer on the destination +-(--update) ++ Ignore files using a similar algorithm to CVS ++(-C) + + +- Skip newer destination files +- +- +- true ++ Ignore files the CVS way + + + +@@ -2204,8 +2201,8 @@ If you have no idea what these mean, leave them untouched !! + + + +- +- ++ ++ + + + 0 +@@ -2222,16 +2219,19 @@ If you have no idea what these mean, leave them untouched !! + PointingHandCursor + + +- Ignore files using a similar algorithm to CVS +-(-C) ++ Do not backup source files that are newer on the destination ++(--update) + + +- Ignore files the CVS way ++ Skip newer destination files ++ ++ ++ true + + + +- +- ++ ++ + + + 0 +@@ -2248,17 +2248,17 @@ If you have no idea what these mean, leave them untouched !! + PointingHandCursor + + +- Files that are hard-linked together on the source will hard-link together on the destination +-WARNING: All files have to be included in the transfer set !! +-(-H) ++ Check this is you use a FAT/NTFS partition as destination. ++Data ownership and permissions will NOT be preserved. ++(-t --modify-window=1) + + +- Preserve hard links ++ Destination is FAT/NTFS + + + +- +- ++ ++ + + + 0 +@@ -2275,12 +2275,12 @@ WARNING: All files have to be included in the transfer set !! + PointingHandCursor + + +- Check this is you use a FAT/NTFS partition as destination. +-Data ownership and permissions will NOT be preserved. +-(-t --modify-window=1) ++ Files that are hard-linked together on the source will hard-link together on the destination ++WARNING: All files have to be included in the transfer set !! ++(-H) + + +- Destination is FAT/NTFS ++ Preserve hard links + + + +@@ -2312,8 +2312,21 @@ and mapping them at both ends. + + + +- +- ++ ++ ++ ++ Qt::Vertical ++ ++ ++ ++ 20 ++ 40 ++ ++ ++ ++ ++ ++ + + + 0 +@@ -2330,16 +2343,11 @@ and mapping them at both ends. + PointingHandCursor + + +- This tells the receiving side to attempt super-user activities +-even if the receiving rsync wasn’t run by the super-user. +-These activities include: +-preserving users via the --owner option +-preserving all groups (not just the current user’s groups) via the --groups option +-and copying devices via the --devices option. +-(--super) ++ Restore backed-up windows permissions which are located in the NTFS Security Descriptor Stream ++(--restore-nt-streams) + + +- Attempt super-user activities ++ Restore permissions + + + +@@ -2372,8 +2380,8 @@ and copying devices via the --devices option. + + + +- +- ++ ++ + + + 0 +@@ -2390,26 +2398,28 @@ and copying devices via the --devices option. + PointingHandCursor + + +- Restore backed-up windows permissions which are located in the NTFS Security Descriptor Stream +-(--restore-nt-streams) ++ This tells the receiving side to attempt super-user activities ++even if the receiving rsync wasn’t run by the super-user. ++These activities include: ++preserving users via the --owner option ++preserving all groups (not just the current user’s groups) via the --groups option ++and copying devices via the --devices option. ++(--super) + + +- Restore permissions ++ Attempt super-user activities + + + +- +- +- +- Qt::Vertical ++ ++ ++ ++ Preserve Attribute + +- +- +- 20 +- 40 +- ++ ++ true + +- ++ + + + +@@ -2418,8 +2428,8 @@ and copying devices via the --devices option. + + 0 + 0 +- 213 +- 237 ++ 207 ++ 187 + + + +@@ -2667,8 +2677,8 @@ and copying devices via the --devices option. + + 0 + 0 +- 570 +- 301 ++ 475 ++ 362 + + + +@@ -2968,8 +2978,8 @@ ATTENTION: check this if you really know what you're doing + + 0 + 0 +- 213 +- 239 ++ 214 ++ 187 + + + +@@ -3545,374 +3555,5 @@ Leave unchecked to create an extra directory inside destination + + + +- +- +- lineEdit_excludeAdd +- returnPressed() +- pushButton_excludeAdd +- animateClick() +- +- +- 58 +- 191 +- +- +- 211 +- 193 +- +- +- +- +- lineEdit_includeAdd +- returnPressed() +- pushButton_includeAdd +- animateClick() +- +- +- 40 +- 166 +- +- +- 176 +- 165 +- +- +- +- +- checkBox_ssh +- toggled(bool) +- label_sshPassword +- setEnabled(bool) +- +- +- 45 +- 193 +- +- +- 62 +- 191 +- +- +- +- +- checkBox_remoteModule +- toggled(bool) +- label_rsyncPassword +- setEnabled(bool) +- +- +- 74 +- 195 +- +- +- 51 +- 193 +- +- +- +- +- checkBox_remoteModule +- toggled(bool) +- lineEdit_rsyncPassword +- setEnabled(bool) +- +- +- 74 +- 195 +- +- +- 74 +- 193 +- +- +- +- +- checkBox_ssh +- toggled(bool) +- label_sshPort +- setEnabled(bool) +- +- +- 45 +- 193 +- +- +- 62 +- 193 +- +- +- +- +- checkBox_ssh +- toggled(bool) +- lineEdit_sshPort +- setEnabled(bool) +- +- +- 45 +- 193 +- +- +- 96 +- 193 +- +- +- +- +- checkBox_ssh +- toggled(bool) +- toolButton_sshPassword +- setEnabled(bool) +- +- +- 45 +- 193 +- +- +- 96 +- 191 +- +- +- +- +- checkBox_remoteModule +- toggled(bool) +- toolButton_rsyncPassword +- setEnabled(bool) +- +- +- 74 +- 195 +- +- +- 96 +- 193 +- +- +- +- +- lineEdit_executeBeforeAdd +- returnPressed() +- pushButton_executeBeforeAdd +- animateClick() +- +- +- 94 +- 203 +- +- +- 137 +- 204 +- +- +- +- +- lineEdit_executeAfterAdd +- returnPressed() +- pushButton_executeAfterAdd +- animateClick() +- +- +- 58 +- 192 +- +- +- 211 +- 193 +- +- +- +- +- checkBox_excludeFile +- toggled(bool) +- lineEdit_excludeFile +- setEnabled(bool) +- +- +- 105 +- 358 +- +- +- 180 +- 359 +- +- +- +- +- checkBox_excludeFile +- toggled(bool) +- toolButton_excludeFile +- setEnabled(bool) +- +- +- 105 +- 358 +- +- +- 210 +- 360 +- +- +- +- +- checkBox_includeFile +- toggled(bool) +- toolButton_includeFile +- setEnabled(bool) +- +- +- 47 +- 187 +- +- +- 109 +- 187 +- +- +- +- +- checkBox_includeFile +- toggled(bool) +- lineEdit_includeFile +- setEnabled(bool) +- +- +- 47 +- 187 +- +- +- 79 +- 187 +- +- +- +- +- lineEdit_optionsAdd +- returnPressed() +- pushButton_optionsAdd +- animateClick() +- +- +- 86 +- 190 +- +- +- 211 +- 191 +- +- +- +- +- checkBox_FATntfs +- toggled(bool) +- checkBox_permissions +- setDisabled(bool) +- +- +- 364 +- 300 +- +- +- 189 +- 225 +- +- +- +- +- checkBox_FATntfs +- toggled(bool) +- checkBox_ownership +- setDisabled(bool) +- +- +- 369 +- 300 +- +- +- 194 +- 200 +- +- +- +- +- checkBox_ssh +- toggled(bool) +- lineEdit_sshPassword +- setEnabled(bool) +- +- +- 70 +- 338 +- +- +- 341 +- 367 +- +- +- +- +- checkBox_ssh +- toggled(bool) +- lineEdit_sshOptions +- setEnabled(bool) +- +- +- 70 +- 338 +- +- +- 357 +- 396 +- +- +- +- +- checkBox_ssh +- toggled(bool) +- label_sshPassword_2 +- setEnabled(bool) +- +- +- 70 +- 338 +- +- +- 91 +- 396 +- +- +- +- +- checkBox_ssh +- toggled(bool) +- label_sshPassword_3 +- setEnabled(bool) +- +- +- 57 +- 334 +- +- +- 359 +- 334 +- +- +- +- +- checkBox_ssh +- toggled(bool) +- lineEdit_sshPasswordStr +- setEnabled(bool) +- +- +- 57 +- 334 +- +- +- 495 +- 334 +- +- +- +- ++ + +-- +2.30.2