Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-15 02:44:23 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,424 Commits 1 Branch 0 Tags 103 MiB
e7bd924196
Commit Graph

1440 Commits

Author SHA1 Message Date
Tavi
aed895e1ad
More backports 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-08-05 16:49:08 -04:00
Tavi
d2d0c48a25
Reconcile picks 
no effective change:
https://review.lineageos.org/q/topic:%22P_asb_2024-05%22

gains 8 patches:
https://review.lineageos.org/q/topic:%22Q_asb_2024-06%22
https://review.lineageos.org/q/topic:%22Q_asb_2024-07%22

Signed-off-by: Tavi <tavi@divested.dev>
 2024-08-05 16:27:33 -04:00
Tavi
f07e0f4722
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-08-05 16:01:39 -04:00
Tavi
2bb4d94f88
Fixup + Churn 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-08-01 00:28:48 -04:00
Tavi
094b4f4f41 Update CVE patchers 
Likely breakage

Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-31 22:19:43 -04:00
Tavi
0c4b0672e4
Fix spacing 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-31 20:52:05 -04:00
Tavi
72ff1b1a4d
16.0+: Relaxed fix for DNS leaks with app based VPNs from GrapheneOS 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-31 20:50:20 -04:00
Tavi
5fb3319508
Update commons 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-31 20:31:27 -04:00
Tavi
59b9517c08
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-29 18:28:29 -04:00
Tavi
c45060675e
Going the distance... [pt3] 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-27 18:00:56 -04:00
Tavi
33ee2a1c28
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-24 17:24:31 -04:00
Tavi
1f65053495
Fixup 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-18 21:44:00 -04:00
Tavi
e6f816f4a0
Update CVE patchers 
Likely breakage
CVE-2022-48781 maybe change to 5.16-^5.17

Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-18 14:34:16 -04:00
Tavi
c250665b4f
15.1 & 17.1: Fixup incorrect patch hunk 
Needs to be in smp_proc_init not smp_proc_rand
All other branches checked to be correct

15.1: additionally use @syphyr's response backport due to lack of status field

Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-17 18:23:35 -04:00
Tavi
3400a35eb1
15.1: July 2024 ASB work 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-17 17:57:47 -04:00
Tavi
105767c7a7
Reconcile picks 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-17 17:46:34 -04:00
Tavi
85e5812290
16.0: July 2024 ASB work 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-17 17:43:18 -04:00
Tavi
218493fc4a
17.1: July 2024 ASB work 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-17 14:18:36 -04:00
Tavi
bcfba01d60
Reconcile picks 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-16 18:37:07 -04:00
Tavi
837cfbbf48
18.1: July ASB work 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-15 15:50:17 -04:00
Tavi
30b658da98
Reconcile picks 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-14 16:53:44 -04:00
Tavi
7182e4d63a
19.1: July 2024 ASB work 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-14 13:40:10 -04:00
Tavi
236a403d12
Fixup + Churn 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-13 18:46:53 -04:00
Tavi
f0de4dbf4c
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-11 14:14:49 -04:00
Tavi
9efddf820f
20.0: July 2024 ASB picks 
ce7b9fd0f5
d39bbaa57e
df49ae67f1
a0afe17e81
cb2db1244c
93a2c9a876
ed52683e9c
09e6330796

Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-11 13:26:47 -04:00
Tavi
ef65af8a8e
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-10 15:50:57 -04:00
Tavi
a970293398
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-08 14:43:28 -04:00
Tavi
9d69c5aee8
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-06 12:47:56 -04:00
Tavi
fa6322126d
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-05 13:35:38 -04:00
Tavi
093df020a2
14.1: July ASB picks 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-04 09:19:46 -04:00
Tavi
1e2d7e9218
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-02 09:50:28 -04:00
Tavi
a7ce9de6e8
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-07-01 10:29:36 -04:00
Tavi
c7c759afd4
20.0: Add "Smart Pixels" screen filter feature 
never starts, missing something

de9aa33971
af0aa9c4c3

aa5684f586

not used
dbc6f643b9
50d3f972a9

Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-29 11:56:16 -04:00
Tavi
d631c5dd63
FIXUP 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-27 01:29:19 -04:00
Tavi
4b5bd17510
Update CVE patchers 
likely some breakage

Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-27 01:01:08 -04:00
Tavi
2e84510f6f
Fixup 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-25 21:57:56 -04:00
Tavi
e96e53ff68
Backport CarrierConfig2 to 18.1 and 19.1 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-25 08:40:49 -04:00
Tavi
2850ff678a Runtime control of CarrierConfig2 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-25 04:19:06 -04:00
Tavi
d09584417e
Update CVE patchers 
maybe some breakage

Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-20 15:27:45 -04:00
Tavi
f1c027ecac
Churn + Fixes 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-19 23:57:56 -04:00
Tavi
fcd8808b35
Churn 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-19 19:21:32 -04:00
Tavi
e6fc32e012
17.1: June ASB work 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-19 18:14:14 -04:00
Tavi
203e27bc0c
15.1: June ASB work 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-19 16:21:45 -04:00
Tavi
7e6c6ad5e5
16.0: June ASB picks 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-19 16:11:38 -04:00
Tavi
39a015c55a
Fixups + Churn 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-17 02:18:18 -04:00
Tavi
ba9e22dc77
Reconcile picks 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-16 15:55:36 -04:00
Tavi
7357b970ef
Fixup + Churn 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-13 23:08:32 -04:00
Tavi
3096e8ad9e
Update commons 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-13 15:58:40 -04:00
Tavi
7f00fd1dde
20.0: June 2024 ASB picks 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-13 15:11:11 -04:00
Tavi
0d7fbddc87
Churn 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-12 00:41:54 -04:00
Tavi
3e8fb83013
Update CVE patchers 
no change

Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-11 10:56:54 -04:00
Tavi
cf11dd7727
Update CVE patchers 
no change

Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-10 14:33:06 -04:00
Tavi
c7b131ad60
14.1: June ASB picks 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-07 12:05:00 -04:00
Tavi
8383cd716d
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-06 15:47:27 -04:00
Tavi
1636f68138
Update CVE patchers 
Fixes https://github.com/Divested-Mobile/DivestOS-Build/issues/308

Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-03 16:27:15 -04:00
Tavi
fbc61bfcc7
17.1: reconcile picks 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-03 14:39:13 -04:00
Tavi
f91f45a7bd
Update CVE patchers 
Maybe some breakage

Signed-off-by: Tavi <tavi@divested.dev>
 2024-06-01 12:35:18 -04:00
Tavi
97ad0c69fe
Update CVE patchers 
This expands loose versioning for 4.9 and 4.14

compile tested:
- cheeseburger/4.4
- fajita/4.9
- flame/4.14
- FP4/4.19
- lemonadep/5.4
- bluejay/5.10

CVE-2023-52879/5.4 may need to be expanded to other 5.4 kernels

this also patches CVE-2024-1086 for 4.9, 4.14, and 5.10

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-31 20:55:45 -04:00
Tavi
4cf2b308ff Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-30 13:52:45 -04:00
Tavi
03e48ad81b
Fixup 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-28 10:56:42 -04:00
Tavi
3e9d2b9bb0
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-28 10:30:53 -04:00
Tavi
b5e04a00ae
Fixup 
Closes https://github.com/Divested-Mobile/DivestOS-Build/issues/306

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-27 12:36:17 -04:00
Tavi
a136f27ae6
Fixup 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-26 22:50:29 -04:00
Tavi
028541103d
Fixup 
Manually checked 3.4 and 4.4
Likely still more breakage

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-26 19:26:14 -04:00
Tavi
d2330cce15
Update CVE patchers 
This probably breaks all of them

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-26 18:29:36 -04:00
Tavi
ec9a38452d
21.0: trying to compile 
frameworks/base/core/java/android/util/NtpTrustedTime.java:275: error: cannot find symbol
            final ContentResolver resolver = getContext().getContentResolver();

frameworks/base/core/java/android/content/pm/SpecialRuntimePermAppUtils.java:38: error: method checkPermission in class PermissionManager cannot be applied to given types;
        return PermissionManager.checkPermission(Manifest.permission.INTERNET, Process.myPid(), Process.myUid())

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-20 19:23:31 -04:00
Tavi
23a2127669
21.0: More work 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-20 18:50:40 -04:00
Tavi
07951955d3
21.0: more work 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-20 18:13:59 -04:00
Tavi
26f1ce99a9
21.0: more work 
packages/apps/Settings done

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-20 14:13:53 -04:00
Tavi
afe1135384
Cleanup 
- Removes unused files/patches
- Removes many guards, these likely don't work anyway due to patchsets having dependencies
- No functional change

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-20 13:25:08 -04:00
Tavi
d98f33a337 21.0: Initial bringup 
TODO:
- f/w/b
- settings

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-20 11:53:38 -04:00
Tavi
ce0dac994c
Fixup 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-19 15:17:27 -04:00
Tavi
dd9f51c8ee
Update CVE patchers 
maybe some breakage

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-19 12:35:44 -04:00
Tavi
1607155923
Backport the server choices patch to 18.1 and 19.1 
Tested working on 20.0

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-18 17:31:59 -04:00
Tavi
9ddc388f03
Churn 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-18 16:49:16 -04:00
Tavi
67e962e0f6
20.0: Updater: Add server choices 
Also fixes .onion support

TODO: Test and backport to previous branches

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-18 13:00:15 -04:00
Tavi
79df8d06d0
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-14 15:34:02 -04:00
Tavi
674c84855d
Churn 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-13 19:00:38 -04:00
Tavi
89ab1d69ef
Churn 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-12 11:44:47 -04:00
Tavi
9c2914272a
Reconcile 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-11 13:39:40 -04:00
Tavi
d782ef887b
Reconcile 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-11 12:33:31 -04:00
Tavi
151caed4da
Reconcile 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-11 12:29:37 -04:00
Tavi
0dcdeb029a
Import Q_asb_2024-04 and R_asb_2024-05 + fixups 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-11 11:14:58 -04:00
Tavi
c31e67b2f8
May ASB work 
untested

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-10 19:56:31 -04:00
Tavi
e195e38150
16.0: switch to latest hardened_malloc revision 
kipper compiles

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-10 19:26:53 -04:00
Tavi
ae523985ca
Correct ordering 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-09 14:23:03 -04:00
Tavi
0c88720caa
14.1: work on integrating hardened_malloc 
untested as all currently supported 14.1 devices are 32-bit

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-09 13:46:19 -04:00
Tavi
31a147ab98
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-09 13:24:43 -04:00
Tavi
28d2113957
15.1: switch to latest hardened_malloc revision and enable it 
verified working on bullhead via:
- top
- /proc/self/maps with -DLABEL_MEMORY
- Sanitizer Test App and logcat

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-09 11:18:05 -04:00
Tavi
650fc2ec27
Churn 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-08 16:31:39 -04:00
Tavi
1fdedf21a5
Update CVE patchers 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-08 14:09:13 -04:00
Tavi
abddd5231f
Quick verify of patchWorkspace for 14.1 through 19.1 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-08 12:51:25 -04:00
Tavi
59bf3b75c7
17.1: Import and verify picks 
https://review.lineageos.org/c/LineageOS/android_frameworks_base/+/353117
https://review.lineageos.org/q/topic:Q_asb_2023-03
https://review.lineageos.org/q/topic:Q_asb_2023-04
https://review.lineageos.org/q/topic:Q_asb_2023-05
https://review.lineageos.org/q/topic:Q_asb_2023-06
https://review.lineageos.org/q/topic:Q_asb_2023-07
https://review.lineageos.org/q/topic:Q_asb_2023-08
	accounted for via patches:
	https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376560
	https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376561
	https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376562
https://review.lineageos.org/q/topic:Q_asb_2023-09
https://review.lineageos.org/q/topic:Q_asb_2023-10
https://review.lineageos.org/q/topic:Q_asb_2023-11
	accounted for via patches:
	https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376563
	accounted for via manifest change:
	https://review.lineageos.org/c/LineageOS/android_external_webp/+/376568
https://review.lineageos.org/q/topic:Q_asb_2023-12
https://review.lineageos.org/q/topic:Q_asb_2024-01
https://review.lineageos.org/q/topic:Q_asb_2024-02
https://review.lineageos.org/q/topic:Q_asb_2024-03

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-08 12:26:07 -04:00
Tavi
f6ad120484
Fixup 082bc48c 
these were not accounted for via manifest

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-08 11:13:09 -04:00
Tavi
1816472bac
17.1: reconcile picks 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-08 11:01:06 -04:00
Tavi
bea8f92380
18.1: Import and verify picks 
https://review.lineageos.org/q/topic:R_asb_2024-03
https://review.lineageos.org/q/topic:R_asb_2024-04

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-08 09:07:38 -04:00
Tavi
268ae82d1e
20.0: Switch to latest (prebuilt) OpenEUICC 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-08 08:47:09 -04:00
Tavi
1a0e13a70d
20.0: Import picks 
Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-07 19:49:55 -04:00
Tavi
082bc48c32
16.0: Import and verify picks 
https://review.lineageos.org/q/topic:P_asb_2022-05
https://review.lineageos.org/q/topic:P_asb_2022-06
https://review.lineageos.org/q/topic:P_asb_2022-07
https://review.lineageos.org/q/topic:P_asb_2022-08
https://review.lineageos.org/q/topic:P_asb_2022-09
https://review.lineageos.org/q/topic:P_asb_2022-10
https://review.lineageos.org/q/topic:P_asb_2022-11
https://review.lineageos.org/q/topic:P_asb_2022-12
https://review.lineageos.org/q/topic:P_asb_2023-01
https://review.lineageos.org/q/topic:P_asb_2023-02
https://review.lineageos.org/q/topic:P_asb_2023-03
https://review.lineageos.org/q/topic:P_asb_2023-04
https://review.lineageos.org/q/topic:P_asb_2023-05
https://review.lineageos.org/q/topic:P_asb_2023-06
https://review.lineageos.org/q/topic:P_asb_2023-07
	accounted for via manifest change:
	https://review.lineageos.org/c/LineageOS/android_external_freetype/+/361250
https://review.lineageos.org/q/topic:P_asb_2023-08
	accounted for via manifest change:
	https://review.lineageos.org/c/LineageOS/android_external_freetype/+/364606
	accounted for via patches:
	https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/365328
https://review.lineageos.org/q/topic:P_asb_2023-09
https://review.lineageos.org/q/topic:P_asb_2023-10
https://review.lineageos.org/q/topic:P_asb_2023-11
	accounted for via patches:
	https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/374916
https://review.lineageos.org/q/topic:P_asb_2023-12
https://review.lineageos.org/q/topic:P_asb_2024-01
https://review.lineageos.org/q/topic:P_asb_2024-02
https://review.lineageos.org/q/topic:P_asb_2024-03
https://review.lineageos.org/q/topic:P_asb_2024-04

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-07 19:43:19 -04:00
Tavi
7162b237d3
14.1: Import and verify picks 
https://review.lineageos.org/q/topic:n-asb-2021-09
https://review.lineageos.org/q/topic:n-asb-2021-10
https://review.lineageos.org/q/topic:n-asb-2021-11
https://review.lineageos.org/q/topic:n-asb-2021-12
https://review.lineageos.org/q/topic:n-asb-2022-01
https://review.lineageos.org/q/topic:n-asb-2022-02
https://review.lineageos.org/q/topic:n-asb-2022-03
https://review.lineageos.org/q/topic:n-asb-2022-04
https://review.lineageos.org/q/topic:n-asb-2022-05
https://review.lineageos.org/q/topic:n-asb-2022-06
https://review.lineageos.org/q/topic:n-asb-2022-07
https://review.lineageos.org/q/topic:n-asb-2022-08
https://review.lineageos.org/q/topic:n-asb-2022-09
https://review.lineageos.org/q/topic:n-asb-2022-10
https://review.lineageos.org/q/topic:n-asb-2022-11
https://review.lineageos.org/q/topic:n-asb-2022-12
https://review.lineageos.org/q/topic:n-asb-2023-01
https://review.lineageos.org/q/topic:n-asb-2023-02
https://review.lineageos.org/q/topic:n-asb-2023-03
https://review.lineageos.org/q/topic:n-asb-2023-04
https://review.lineageos.org/q/topic:n-asb-2023-05
https://review.lineageos.org/q/topic:n-asb-2023-06
https://review.lineageos.org/q/topic:n-asb-2023-07
	accounted for via manifest change:
	https://review.lineageos.org/c/LineageOS/android_external_freetype/+/360899
https://review.lineageos.org/q/topic:n-asb-2023-08
https://review.lineageos.org/q/topic:n-asb-2023-09
https://review.lineageos.org/q/topic:n-asb-2023-10
https://review.lineageos.org/q/topic:n-asb-2023-11
	was missing:
	https://review.lineageos.org/c/LineageOS/android_packages_providers_TelephonyProvider/+/376079
https://review.lineageos.org/q/topic:n-asb-2023-12
https://review.lineageos.org/q/topic:n-asb-2024-01
https://review.lineageos.org/q/topic:n-asb-2024-02
https://review.lineageos.org/q/topic:n-asb-2024-03
https://review.lineageos.org/q/topic:n-asb-2024-04
https://review.lineageos.org/q/topic:n-asb-2024-05

Signed-off-by: Tavi <tavi@divested.dev>
 2024-05-07 17:45:58 -04:00